top level shiiiiit
fix merge confs