zorya changes to configs
merge online and zorya configs