handling of conflict