Changing the color to red.
Changing the color to red.

Manually resolved conflicts with blue.