diff --git a/app/manifest.json b/app/manifest.json
index 0f5a2566f..ad500e40a 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -74,4 +74,8 @@
     ]
   },
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'"
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> Intergrate ENS with IPFS
diff --git a/app/scripts/lib/portalnetwork.js b/app/scripts/lib/portalnetwork.js
index 960871ebc..977f17926 100644
--- a/app/scripts/lib/portalnetwork.js
+++ b/app/scripts/lib/portalnetwork.js
@@ -33,4 +33,4 @@ module.exports = function (provider) {
         })
         return { cancel: true }
     }, {urls: ["*://*.eth/"]})
-}
\ No newline at end of file
+}