removing left over merge conflicts