Fix merge problem--update config