observations and hr
resolved conflicts