settles merge conflict