diff --git a/package.json b/package.json
index 6f3824a..7c8124c 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,7 @@
   "name": "@eeacms/industry-frontend",
   "description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
   "license": "MIT",
-<<<<<<< HEAD
   "version": "3.3.0",
-=======
-  "version": "3.2.3",
->>>>>>> origin/master
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
   "homepage": "https://github.com/eea/industry-frontend",