Added Conflict::NEW, moved some code
Added macros for displaying color