Removes merge conflicts