Settings: Fix conflicts.