diff --git a/package.json b/package.json
index 7961693..91bd6b6 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "react-chatbot-kit",
-<<<<<<< HEAD
   "version": "2.1.2",
-=======
-  "version": "2.1.0-beta.2",
->>>>>>> da7bc11 (2.1.0-beta.2)
   "homepage": "https://fredrikoseberg.github.io/react-chatbot-kit-docs/",
   "description": "Fully customizable chatbot kit for react.",
   "main": "build/index.js",