the rest of the merges from old conf