in the middle
resolved conflict