fix merge conflict

apt.txt

environment.yml

prepare.sh

resources/AQbench_dataset.csv

resources/AQbench_variables.csv

resources/metadata_cols.csv

resources/metadata_decoding.csv

resources/metrics_cols.csv

resources/seriesid_cols.csv

resources/station_groups.csv

resources/toar_dataset_groups.csv

run.sh

source/dataset_mapplot.py

source/dataset_preanalysis.py

source/dataset_retrieval.py

source/dataset_sanitycheck.py

source/introduction_jupyter.ipynb

source/mapping_baseline_experiments.py

source/mapping_comparison.py

source/mapping_data.py