atom config
merge