remove debug output, change error message text
Merge remote-tracking branch upstream/$:{upbranch}