the conflict has been resolved