some stuff
merge confs
fixed routes