diff --git a/scripts/patches.sh b/scripts/patches.sh
index bbbfebd..6ab12f4 100644
--- a/scripts/patches.sh
+++ b/scripts/patches.sh
@@ -25,7 +25,7 @@ sed -i 's/5.0/1.0/' .ccache/ccache.conf || true
 if [ $BRANCH == 'master' ]; then
 
   sed -i 's/5.10/5.4/' target/linux/rockchip/Makefile
-  git revert --no-commit 91eed5d9fb74e6c740291362ba12e11a2222a9fd
+  git revert --no-commit -X theirs 91eed5d9fb74e6c740291362ba12e11a2222a9fd
   
   echo '# CONFIG_CRYPTO_GHASH_ARM_CE is not set' >> target/linux/sunxi/cortexa7/config-5.10
   echo '# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set' >> target/linux/sunxi/cortexa7/config-5.10