diff --git a/Changelog.md b/Changelog.md
index 6530d64..3100ba1 100755
--- a/Changelog.md
+++ b/Changelog.md
@@ -1178,6 +1178,7 @@ dom.webaudio.enabled = true
 screensharing `media.getusermedia.screensharing.enabled = true`
 #### Enable addons search
 ```
+<<<<<<< HEAD
 extensions.getAddons.search.browseURL = "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"
 ```
 #### Enable addons manual updates
@@ -1203,6 +1204,8 @@ defaultPref("general.oscpu.override", "Windows NT 6.1");
 lockPref("general.buildID.override", "20100101");
 lockPref("browser.startup.homepage_override.buildID", "20100101");
 >>>>>>> 653a6ed (knocked out some more prefs)
+=======
+>>>>>>> e7ed7c4 (updated changelog)
 
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1246,7 +1249,7 @@ Other points:
 // COOKIES - now using dFPI
 // SB - make re-enabling easier, test connections
 
-for arkenfox:
+from arkenfox:
 dom.security.https_only_mode_send_http_background_request  ->  DISCUSS
 dom.storage.next_gen  ->  DISCUSS
 security.pki.crlite_mode  ->  DISCUSS