Fix merge conflicts

Author: rbeucher

src/access_moppy/driver.py

@@ -112,7 +112,7 @@ def __init__(
                 self.cmoriser = CMIP6_Ocean_CMORiser_OM3(
                     input_paths=self.input_paths,
                     output_path=str(self.output_path),
-                    cmor_name=cmor_name,
+                    compound_name=self.compound_name,
                     cmip6_vocab=self.vocab,
                     variable_mapping=self.variable_mapping,
                     drs_root=drs_root if drs_root else None,
@@ -123,7 +123,7 @@ def __init__(
                 self.cmoriser = CMIP6_Ocean_CMORiser_OM2(
                     input_paths=self.input_paths,
                     output_path=str(self.output_path),
-                    cmor_name=cmor_name,
+                    compound_name=self.compound_name,
                     cmip6_vocab=self.vocab,
                     variable_mapping=self.variable_mapping,
                     drs_root=drs_root if drs_root else None,

src/access_moppy/ocean.py

@@ -174,15 +174,15 @@ def __init__(
         self,
         input_paths: Union[str, List[str]],
         output_path: str,
-        cmor_name: str,
+        compound_name: str,
         cmip6_vocab: CMIP6Vocabulary,
         variable_mapping: Dict[str, Any],
         drs_root: Optional[Path] = None,
     ):
         super().__init__(
             input_paths=input_paths,
             output_path=output_path,
-            cmor_name=cmor_name,
+            compound_name=compound_name,
             cmip6_vocab=cmip6_vocab,
             variable_mapping=variable_mapping,
             drs_root=drs_root,
@@ -232,15 +232,15 @@ def __init__(
         self,
         input_paths: Union[str, List[str]],
         output_path: str,
-        cmor_name: str,
+        compound_name: str,
         cmip6_vocab: CMIP6Vocabulary,
         variable_mapping: Dict[str, Any],
         drs_root: Optional[Path] = None,
     ):
         super().__init__(
             input_paths=input_paths,
             output_path=output_path,
-            cmor_name=cmor_name,
+            compound_name=compound_name,
             cmip6_vocab=cmip6_vocab,
             variable_mapping=variable_mapping,
             drs_root=drs_root,