diff --git a/bin/omarchy-update b/bin/omarchy-update
index 6a71409..9eadcf8 100755
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@@ -12,6 +12,7 @@ fi
 
 # Get the latest while trying to preserve any modifications
 git pull --autostash
+git diff --check || git reset --merge
 
 # Run any pending migrations
 for file in migrations/*.sh; do