diff --git a/CHANGELOG b/CHANGELOG
index 80ea253..94cbaa0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,5 +5,9 @@
 * Huge speedup by caching ldap
 
 [0.1.2]
+<<<<<<< HEAD
 * Uses syncthing generated config
 * Bumps to version 0.14.28
+=======
+* Fixed wrong URL
+>>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 2b5b6e0..13d54c0 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -21,7 +21,11 @@
     }
   },
   "manifestVersion": 1,
+<<<<<<< HEAD
   "website": "https://syncthing.net",
+=======
+  "website": "http://syncthing.net",
+>>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
   "tags": [