Merge both config files to avoid missing settings after an upgrade

This should resolve #2 - your decision.