Merge old configuration