trying to deal with conflict