clear
fixed merge confs