diff --git a/package-lock.json b/package-lock.json
index ac02ee9..215d179 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,10 +1,6 @@
 {
   "name": "pilas-bloques-exercises",
-<<<<<<< HEAD
   "version": "1.4.18",
-=======
-  "version": "1.4.17",
->>>>>>> master
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 16fda00..54b9363 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "pilas-bloques-exercises",
-<<<<<<< HEAD
   "version": "1.4.18",
-=======
-  "version": "1.4.17",
->>>>>>> master
   "description": "Exercises for Pilas Bloques",
   "homepage": "http://pilasbloques.program.ar",
   "author": {