fix config
merge