Per-project settings improved
Conflict