Template define and call, better error message
Merge remote-tracking branch 'origin/master'