diff --git a/scripts/build.sh b/scripts/build.sh
index 7ad7da534..d8330eb8a 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -20,6 +20,7 @@ if [ "$2" == "--setup" ] || [ "$3" == "--setup" ] || [ "$4" == "--setup" ]; then
 		
 		cd "$paperbasedir"
 		./paper patch
+        git am --skip" instead
 	)
 fi