Add red
Add blue
Resolve conflict, merge in blue to be purple