how to resolve git merge conflicts