Merge with new server config section