Is this how you .yaml files?
Merge remote-tracking branch 'origin/master'