Add check for a local (override) config file.
Example override should be commented out!
Merge remote-tracking branch 'upstream/master'