Merge default overrides with override.conf