diff --git a/CloudronManifest.json b/CloudronManifest.json
index 13d54c0..68355f6 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "healthCheckPath": "/check",
   "httpPort": 8000,
   "addons": {
@@ -21,11 +21,7 @@
     }
   },
   "manifestVersion": 1,
-<<<<<<< HEAD
   "website": "https://syncthing.net",
-=======
-  "website": "http://syncthing.net",
->>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
   "tags": [