Added "conflict" color to main list