Conflict markers got committed.