diff --git a/blimp.nim b/blimp.nim
index 327e6f0..34fe304 100644
--- a/blimp.nim
+++ b/blimp.nim
@@ -36,7 +36,11 @@ let
 [rsync]
 # Set this to your remote rsync daemon area
 remote = "blimpuser@some-rsync-server.com::blimpstore"
+<<<<<<< HEAD
 password = "some-good-rsync-password-for-blimpuser"
+=======
+password = some-good-rsync-password-for-blimpuser
+>>>>>>> abbc06c70c476280fd304b432c6f4d42caaecabf
 
 # The following three formats should not need editing
 # $1 is filename, $2 is remote and $3 is the local blimpstore