fixing merge conflicts

data/data-pipeline/data_pipeline/etl/sources/census_acs/etl.py

@@ -1,19 +1,19 @@
-from collections import namedtuple
 import os
-import pandas as pd
-import geopandas as gpd
+from collections import namedtuple
 
+import geopandas as gpd
+import pandas as pd
 from data_pipeline.config import settings
 from data_pipeline.etl.base import ExtractTransformLoad
-from data_pipeline.etl.sources.census_acs.etl_utils import (
-    retrieve_census_acs_data,
-)
 from data_pipeline.etl.sources.census_acs.etl_imputations import (
     calculate_income_measures,
 )
-
-from data_pipeline.utils import get_module_logger, unzip_file_from_url
+from data_pipeline.etl.sources.census_acs.etl_utils import (
+    retrieve_census_acs_data,
+)
 from data_pipeline.score import field_names
+from data_pipeline.utils import get_module_logger
+from data_pipeline.utils import unzip_file_from_url
 
 logger = get_module_logger(__name__)
 

data/data-pipeline/data_pipeline/etl/sources/census_acs/etl_imputations.py

@@ -1,7 +1,10 @@
-from typing import Any, List, NamedTuple, Tuple
-import pandas as pd
-import geopandas as gpd
+from typing import Any
+from typing import List
+from typing import NamedTuple
+from typing import Tuple
 
+import geopandas as gpd
+import pandas as pd
 from data_pipeline.score import field_names
 from data_pipeline.utils import get_module_logger
 

data/data-pipeline/data_pipeline/etl/sources/census_acs/etl_utils.py

@@ -1,10 +1,9 @@
 import os
 from pathlib import Path
 from typing import List
+
 import censusdata
 import pandas as pd
-
-
 from data_pipeline.etl.sources.census.etl_utils import get_state_fips_codes
 from data_pipeline.utils import get_module_logger