diff --git a/mozilla/xpfe/browser/src/navigator.xul b/mozilla/xpfe/browser/src/navigator.xul
index 5d09c3e0d3a..bbf29a1f525 100644
--- a/mozilla/xpfe/browser/src/navigator.xul
+++ b/mozilla/xpfe/browser/src/navigator.xul
@@ -294,11 +294,7 @@
   <broadcaster id="Browser:Status"/>
   <broadcaster id="Browser:Security" secure="false"/>
   <broadcaster id="Browser:Throbber" busy="false"/>
-<<<<<<< navigator.xul
   <broadcaster id="args" value=""/>
-=======
-  <broadcaster id="args" value="http://www.mozillazine.org"/>
->>>>>>> 1.136
 
   <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
   <broadcaster id="dialog.start" ready="false"/>