fix merging, new cfgs