diff --git a/postrecoveryboot.sh b/postrecoveryboot.sh
index dce0ea5..d65a5ff 100755
--- a/postrecoveryboot.sh
+++ b/postrecoveryboot.sh
@@ -14,7 +14,3 @@ fi
 #cat >> /etc/fstab << EOF
 #/dev/block/mmcblk0p2 /sd-ext $FS rw
 #EOF
-<<<<<<< HEAD
-=======
-
->>>>>>> 40364b7f71c1fadc944e913c7577b31132cf0a65