remedy merge conflict