Trying to get git to work here
Merge origin/master