more refactoring
merge confs