committing remote branch
committing new master
master after conflict resolved