Let's see if this helps any.
Merge remote-tracking branch 'origin/master'