resoving conflict 1