Merge old and new configs