5.8.2.1.15.13.  Correct color conflicts