doing dat pulling
fixed merge confs