remove lingering merge conflicts