diff --git a/hooks/global/pre-commit b/hooks/global/pre-commit
index 4804b35..15bbb0a 100755
--- a/hooks/global/pre-commit
+++ b/hooks/global/pre-commit
@@ -24,7 +24,7 @@ while IFS= read -r -d '' f; do
     esac
     [ -f "$REPO_ROOT/$f" ] || continue
 
-    if grep -nE '^(<<<<<<<|=======|>>>>>>>)' "$REPO_ROOT/$f" >/dev/null 2>&1; then
+    if grep -nE '^(<{7}( \S+)?|=======|>{7}( \S+)?)$' "$REPO_ROOT/$f" >/dev/null 2>    if grep -nE '^(<<<<<<<|=======|>>>>>>>)' "$REPO_ROOT/$f" >/dev/null 2>&1; then1; then
         echo "FAIL conflict markers staged in $f" >&2; FAIL=1
     fi
     case "$f" in