resoving conflicts