diff --git a/package.json b/package.json
index 4d1f8ba..9fa1fc5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,11 @@
 {
+<<<<<<< Updated upstream
   "name": "@orbisclub/orbis-sdk",
   "version": "0.4.17",
+=======
+  "name": "",
+  "version": "0.3.56",
+>>>>>>> Stashed changes
   "description": "Official package to implement quickly an Orbis powered decentralized social layer within your application.",
   "author": "Baptiste Grève",
   "license": "ISC",