diff --git a/build-ff.js b/build-ff.js
index e91cd05..6682cb5 100644
--- a/build-ff.js
+++ b/build-ff.js
@@ -107,11 +107,7 @@ const manif = {
       define: {
         global: 'window',
         execution_mode: '"ff_api"',
-<<<<<<< HEAD
         manifest: '' + manif.manifest_version,
-=======
-        manifest: ''+manif.manifest_version,
->>>>>>> d5298ab (Breaking change fixes)
         isBackground: 'false',
         BUILD_VERSION: JSON.stringify([0, rev])
       },