Move this around so that it won't do anything if it's disabled.
Merge remote-tracking branch 'origin/master'