[PLT-1492] Fix 'flaky' tests spotted during a prod run (#1846)

Author: vbrodsky

libs/labelbox/tests/conftest.py

@@ -2,17 +2,8 @@
 import os
 import re
 import time
-<<<<<<< HEAD
 import uuid
 from datetime import datetime
-=======
-from labelbox.schema.project import Project
-import requests
-from labelbox.schema.ontology import Ontology
-import pytest
-from types import SimpleNamespace
-from typing import Type
->>>>>>> 0bbd7c29 (Vb/fix ontology leaks plt 1379 (#1814))
 from enum import Enum
 from random import randint
 from string import ascii_letters