merge conflict solved, serverCfg no longer empty