diff --git a/scm-server/src/main/conf/server-config.xml b/scm-server/src/main/conf/server-config.xml
index 561a6ad57f..c591b1a7a2 100644
--- a/scm-server/src/main/conf/server-config.xml
+++ b/scm-server/src/main/conf/server-config.xml
@@ -127,8 +127,8 @@
       </Set>
     </New>
   </Set>
-<<<<<<< mine
-=======
+  
+  <!-- TODO fix for jetty 9.2.x -->
   
   <!-- request logging -->
   <!--
@@ -211,6 +211,5 @@
     </Call>
   </Get>
   -->
->>>>>>> theirs
 
 </Configure>