Accidentally committed a merge conflict marker