accidently committed merge conflicts