appt type color
fixed conflicts