Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin/master'
Improved error handling