Config update
Fix merge conflict