Update config to limit conflicts