Conflict markers got left behind.