Better merge for config files