diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9db59205bfebd12bc1f30559629dc3617e1b284f..01842d1037aa87490a7ffd92541ef081bd8310a4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12629,21 +12629,13 @@
     <key>WatchdogEnabled</key>
     <map>
       <key>Comment</key>
-<<<<<<< local
-      <string>Controls whether the thread watchdog timer is activated.</string>
-=======
       <string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string>
->>>>>>> other
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-<<<<<<< local
-      <integer>-1</integer>
-=======
       <integer>0</integer>
->>>>>>> other
     </map>
     <key>WaterGLFogDensityScale</key>
     <map>