resolve conflicts

Author: Matt Sokoloff

.github/workflows/publish-mea.yaml

@@ -11,6 +11,7 @@
 import re
 
 import pytest
+
 from labelbox import Client, LabelingFrontend
 from labelbox.orm.query import results_query_part
 from labelbox.pagination import PaginatedCollection