align "conflicting options" errors for consistency #5488
+66
−10
Merged
Loading