working on config
merging offline changes