diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
index ab0fbd4..2c61bd6 100644
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@ -13,7 +13,10 @@ packages:
 - "faketime"
 reference_datetime: "2011-01-30 00:00:00"
 remotes:
+<<<<<<< HEAD
 - "url": "https://github.com/CrypticCoin/cryptic.git"
+
+>>>>>>> bee8e3e2f0762f3f446b19acda6587157e8c1876
   "dir": "cryptic"
 files:
 - "qt-win32-4.8.5-gitian-r8.zip"