Accidentally committed a merge conflict file.