Fix merge commit

Author: dnerini

resources/inference/configs/interpolator_stretched_with_global.yaml

@@ -100,22 +100,12 @@ output:
                   encoding:
                     typeOfGeneratingProcess: 2
                   templates:
-<<<<<<< HEAD
-                    samples: _resources/templates_index_cosmo.yaml
-=======
                     samples: resources/templates_index_cosmo.yaml
->>>>>>> main
       - grib:
           path: grib/ifs-{dateTime}_{step:03}.grib
           encoding:
             typeOfGeneratingProcess: 2
           templates:
-<<<<<<< HEAD
-            samples: _resources/templates_index_ifs.yaml
-          post_processors:
-            - extract_slice: [189699, -1]
-            - assign_mask: "global/cutout_mask"
-=======
             samples: resources/templates_index_ifs.yaml
           post_processors:
           - extract_mask:
@@ -125,7 +115,6 @@ output:
           - assign_mask:
               mask: "global/cutout_mask" # fill local/global overlapping points with nan
 
->>>>>>> main
 
 verbosity: 1
 allow_nans: true