take care of conflict