diff --git a/frontend/package.json b/frontend/package.json
index 12300f2..ad2ebf2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,10 +1,6 @@
 {
   "name": "chroma",
-<<<<<<< Updated upstream
-  "version": "0.1.12",
-=======
   "version": "0.1.14",
->>>>>>> Stashed changes
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --port 8008",