fix conflict

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Enhancements
 - Give notice that the deprecation works will be done in datumaro==1.5.0
   (<https://github.com/openvinotoolkit/datumaro/pull/1085>)
+- Unify COCO, Datumaro, VOC, YOLO importer/exporter progress reporter descriptions
+  (<https://github.com/openvinotoolkit/datumaro/pull/1100>)
 
 ### Bug fixes
 - Create cache dir under only writable filesystem

src/datumaro/plugins/data_formats/datumaro/base.py

@@ -44,11 +44,7 @@ def __init__(
         rootpath: str,
         images_dir: str,
         pcd_dir: str,
-<<<<<<< HEAD
         ctx: ImportContext,
-=======
-        ctx: Optional[ImportContext] = None,
->>>>>>> unifying importing & exporting progress reporter message
     ) -> None:
         self._path = path
         self._subset = subset
@@ -124,7 +120,9 @@ def _gen():
                 yield item_descs.pop()
 
         items = []
-        for item_desc in pbar.iter(_gen(), desc=f"Importing '{self._subset}'", total=len(item_descs)):
+        for item_desc in pbar.iter(
+            _gen(), desc=f"Importing '{self._subset}'", total=len(item_descs)
+        ):
             item = self._parse_item(item_desc)
             items.append(item)
 
@@ -321,11 +319,7 @@ def __init__(
         rootpath: str,
         images_dir: str,
         pcd_dir: str,
-<<<<<<< HEAD
         ctx: ImportContext,
-=======
-        ctx: Optional[ImportContext] = None,
->>>>>>> unifying importing & exporting progress reporter message
     ) -> None:
         super().__init__(path, subset, rootpath, images_dir, pcd_dir, ctx)
         self._length = None
@@ -466,7 +460,6 @@ def _load_impl(self, path: str) -> None:
         """Actual implementation of loading Datumaro format."""
         self._reader = (
             JsonReader(
-<<<<<<< HEAD
                 path,
                 self._subset,
                 self._rootpath,
@@ -482,13 +475,6 @@ def _load_impl(self, path: str) -> None:
                 self._images_dir,
                 self._pcd_dir,
                 self._ctx,
-=======
-                path, self._subset, self._rootpath, self._images_dir, self._pcd_dir, self._ctx
-            )
-            if not self._stream
-            else StreamJsonReader(
-                path, self._subset, self._rootpath, self._images_dir, self._pcd_dir, self._ctx
->>>>>>> unifying importing & exporting progress reporter message
             )
         )
         return self._reader