Remove accidentally committed merge conflicts