added routercfg
fixed merge errors