Comment out this to see if it works.
Merge remote-tracking branch 'origin/master'