config changes
merge config