deal with conflict