provide more info in case of error
Merge remote-tracking branch 'upstream/master'