remote commit
new commit
resolving conflict