diff --git a/package.json b/package.json
index 04c3205..8de24ed 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "infineon-feedback",
-<<<<<<< HEAD
   "version": "0.0.2",
-=======
-  "version": "0.0.1",
->>>>>>> edc0a71669358fb5b6a92595ac5f5ae4d1537d27
   "description": "Stencil Component Starter",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",