check diff between local and remote
whatever ....
Commiting merge conflicts
Merge branch 'master' of http://github.com/mjsmard/myproject