Comment out conflicting aliases
Disable auto correction
Disable auto-correct
Merge branch 'personalCustomization' into rootCustomization