CONFLICTS RESOLUTION