managing merge conflict