Someone committed a conflicted file.