Update config
Fix conflicts