Update config
merge bug