update config
fix conflicts