commit remote
starting over 1
remote redo
master redo
conflict resolution
adding commit-3