Run the merge-conflict-marker guardrail unconditionally and before any byte-compile so committed markers in .py files fail with a clear message.
Run the merge-conflict-marker guardrail unconditionally and before any byte-compile so committed markers in .py files fail with a clear message.