diff --git a/package-lock.json b/package-lock.json
index 18339cd..1ba3bbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,10 @@
 {
   "name": "wp-redis",
+<<<<<<< HEAD
   "version": "1.3.1",
+=======
+  "version": "1.2.0",
+>>>>>>> 8ee17a0 ([CMS-1033] Add GH action for deployments to wp.org (#368))
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {