diff --git a/contrib/merge-kernel b/contrib/merge-kernel
index 9a694e3..1bfcbfe 100755
--- a/contrib/merge-kernel
+++ b/contrib/merge-kernel
@@ -828,7 +828,7 @@
       die "Please resolve conflicts, commit changes, and then rerun the merge script.\nMake sure you have 'git rerere' enabled."
     fi
     echo "All conflicts resolved, continuing"
-    content_conflicts=($(grep -e 'CONFLICT.*[content|add]' "${tmpfile}" \
+    content_conflicts=($(grep -e 'CONFLICT.*content' -e 'CONFLICT.*add/add' "${tmpfile}" \
                  | sed -e 's/.*Merge conflict in //'))
     delete_conflicts=($(grep -e 'CONFLICT.*delete' "${tmpfile}" \
                  | awk '{print $3;}'  ))