Merge with updated standard config file