diff --git a/onionr/static-data/default_config.json b/onionr/static-data/default_config.json
index 4949c809..b6cb3145 100644
--- a/onionr/static-data/default_config.json
+++ b/onionr/static-data/default_config.json
@@ -7,13 +7,8 @@
         "socket_servers": false,
         "security_level": 0,
         "max_block_age": 2678400,
-<<<<<<< HEAD
-        "public_key": "",
-        "use_new_api_server": false
-=======
         "bypass_tor_check": false,
         "public_key": ""
->>>>>>> pom
     },
 
     "www" : {