diff --git a/public/build/manifest.json b/public/build/manifest.json
index 223c541166..9cf1f5f198 100644
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@@ -372,12 +372,8 @@
     "src": "resources/js/setup/setup.js"
   },
   "resources/sass/app.scss": {
-<<<<<<< HEAD
     "file": "assets/app-039bd735.css",
-=======
-    "file": "assets/app-9454bf28.css",
->>>>>>> v5-develop
     "isEntry": true,
     "src": "resources/sass/app.scss"
   }
-}
\ No newline at end of file
+}