made functional for filling config from local config
conflict fix