fixing merge conflicts

data/data-pipeline/data_pipeline/comparison_tool/src/donut_hole_dacs.yaml

@@ -17,7 +17,7 @@ DEMOGRAPHIC_COLUMNS:
 DEMOGRAPHIC_FILE: ../../data_pipeline/data/dataset/census_acs_2019/usa.csv
 OUTPUT_DATA_PATH: output/donut_hole_dac
 SCORE_FILE: ../../data_pipeline/data/score/csv/full/usa.csv
-OTHER_COMPARATOR_COLUMNS: 
+OTHER_COMPARATOR_COLUMNS:
 - donut_hole_dac
 - P200_PFS
 - HSEF

data/data-pipeline/data_pipeline/comparison_tool/src/run_tract_comparison.py

@@ -12,12 +12,12 @@ To see more: https://buildmedia.readthedocs.org/media/pdf/papermill/latest/paper
 To run:
 ` $ python src/run_tract_comparison.py --template_notebook=TEMPLATE.ipynb --parameter_yaml=PARAMETERS.yaml`
 """
-
-import os
-import datetime
 import argparse
-import yaml
+import datetime
+import os
+
 import papermill as pm
+import yaml
 
 
 def _read_param_file(param_file: str) -> dict:

data/data-pipeline/data_pipeline/comparison_tool/src/utils.py

@@ -1,9 +1,9 @@
 import pathlib
+
 import pandas as pd
 import xlsxwriter
-
-from data_pipeline.score import field_names
 from data_pipeline.etl.sources.census.etl_utils import get_state_information
+from data_pipeline.score import field_names
 
 # Some excel parameters
 DEFAULT_COLUMN_WIDTH = 18