Add colors to the debrief screen
resolve conflicts