conflict exercise
resolved