conflict resolution efforts