diff --git a/front/bo/package.json b/front/bo/package.json
index 79f0b4a..eb59319 100644
--- a/front/bo/package.json
+++ b/front/bo/package.json
@@ -17,15 +17,9 @@
     "test": "jest --detectOpenHandles --forceExit"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@ustra/nuxt": "^2.0.17-stable",
     "@ustra/nuxt-dx-mng-bo": "^2.0.17-stable",
     "@ustra/nuxt-mng-bo": "^2.0.17-stable",
-=======
-    "@ustra/nuxt": "^2.0.15-stable",
-    "@ustra/nuxt-dx-mng-bo": "^2.0.15-stable",
-    "@ustra/nuxt-mng-bo": "^2.0.15-stable",
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     "@ustra-sample/cmm": "1.0.0"
   }
 }
diff --git a/front/cmm/package.json b/front/cmm/package.json
index 8305ccd..6c5ab46 100644
--- a/front/cmm/package.json
+++ b/front/cmm/package.json
@@ -15,10 +15,6 @@
     "test": "jest --detectOpenHandles --forceExit"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@ustra/nuxt": "^2.0.17-stable"
-=======
-    "@ustra/nuxt": "^2.0.15-stable"
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   }
 }
diff --git a/front/fo/package.json b/front/fo/package.json
index a22dbf2..87c6755 100644
--- a/front/fo/package.json
+++ b/front/fo/package.json
@@ -18,13 +18,8 @@
   },
   "dependencies": {
     "@ustra-sample/cmm": "1.0.0",
-<<<<<<< HEAD
     "@ustra/nuxt": "^2.0.17-stable",
     "@ustra/nuxt-buefy": "^2.0.17-stable",
-=======
-    "@ustra/nuxt": "^2.0.15-stable",
-    "@ustra/nuxt-buefy": "^2.0.15-stable",
->>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     "animejs": "^3.2.1"
   }
 }