Merge both config files to avoid missing settings after an upgrade

Resolves #2.