diff --git a/package-lock.json b/package-lock.json
index c8aa7d0..f92e0e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,10 @@
 {
   "name": "@mapcreator/eslint-config",
+<<<<<<< HEAD
   "version": "1.1.0",
+=======
+  "version": "1.0.6",
+>>>>>>> 6d62ccbe587b1b92420c9d5ad1104131c1e967b8
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {