merge conflict solution