corrected merge errors

sen2chain/__init__.py

sen2chain/automatization.py

sen2chain/cloud_mask.py

sen2chain/colormap.py

sen2chain/config.py

...data/eodag_workspace_locations_tiles/custom_locations.yml

...space_locations_tiles/sentinel2_tiling_grid_centroids.cpg

...space_locations_tiles/sentinel2_tiling_grid_centroids.dbf

...space_locations_tiles/sentinel2_tiling_grid_centroids.prj

...space_locations_tiles/sentinel2_tiling_grid_centroids.shp

...space_locations_tiles/sentinel2_tiling_grid_centroids.shx

sen2chain/data_request.py

sen2chain/download_and_process.py

sen2chain/download_eodag.py

sen2chain/geo_utils.py

sen2chain/indices.py

sen2chain/indices_functions.py

sen2chain/jobs.py

sen2chain/library.py

sen2chain/multi_processing.py