conflcts did merge properly