erad
fixed_merge_conf