diff --git a/templates/site-layout.html b/templates/site-layout.html
index e58a6aa..b3e0293 100644
--- a/templates/site-layout.html
+++ b/templates/site-layout.html
@@ -34,6 +34,7 @@ var dialog_title    = "${os.user_dialog[1]}";
 var dialog_message  = "${os.user_dialog[0]}";
 //]]></script>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <!--<script 
 src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />-->
@@ -41,6 +42,10 @@ src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />-->
 <script type="text/javascript"
 src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />
 >>>>>>> parent of 0253c43... merge changes from master and keep former change
+=======
+<script 
+src="/js/pg-desktop-one.js?${cherrypy.config['js_mtime']}" />
+>>>>>>> parent of 2d9caf7... left changes in autocat3. commit to test
 
 <link rel="shortcut icon"             href="/gutenberg/favicon" />
 <link rel="canonical"                 href="${os.canonical_url}" />