added colours to conflict prompt