diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh
index 2af38bb..765c218 100755
--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -56,6 +56,7 @@ if $DO_SSTATE ; then
 fi
 
 if $DO_DEPLOY ; then
+<<<<<<< HEAD
     DEPLOY_PATH="deploy"
     mkdir -p $DEPLOY_PATH
     rm -rf "$DEPLOY_PATH"/*