Never commited with conflicts before. Oops.

And fixed blue being like a cyan