Run git commit based on where we are
Merge remote-tracking branch 'remotes/origin/master'