clean coder commit should end in merge conflict