diff --git a/deploy.sh b/deploy.sh
index 4cb7aee..065557b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -33,7 +33,6 @@ _bash_overrides() {
 
 _cleanup() {
   rm -rf ${THIS}
->>>>>>> master
 }
 
 _main() {