diff --git a/scripts/assert-changed-files.sh b/scripts/assert-changed-files.sh
index 8604ecad7a328..d3af4f8fcf7da 100755
--- a/scripts/assert-changed-files.sh
+++ b/scripts/assert-changed-files.sh
@@ -14,6 +14,12 @@ if [ "$IS_CI" = true ]; then
   if [ $? -ne 0 ]; then
     echo "Branch has conflicts with master, rolling back test."
     git merge --abort
+
+    if [ $? -ne 0 ]; then
+      # seems like we can't abort merge - script doesn't really handle that, we should fail this step because something is wonky
+      echo "Something went wrong, we could not abort our merge command. Please re-run the test."
+      exit 1
+    fi
   fi
 
   git config --local --unset user.name