resolved merge conflicts

Author: root

tests/test_reports_steps.py

@@ -291,7 +291,6 @@ def I_click_confirm_to_generate_report(shared_data):
     attach_screenshot("clicked_reports_download_report_button")
     logging.info("clicked_reports_download_report_button")
 
-
 @then("the report is downloaded successfully")
 def the_report_is_downloaded_successfully(shared_data):
     assert os.path.exists(shared_data['report_download_path']), f"Downloaded file not found: {shared_data['report_download_path']}"
@@ -310,7 +309,6 @@ def the_report_is_downloaded_successfully(shared_data):
     is_valid, _ = validate_report_headers(shared_data['report_download_path'], expected_headers)
     assert is_valid, "Report headers are invalid. See logs for details."
 
-
 @then(parse("the report is downloaded successfully and contains the vaccine record for {nhs_number}"))
 def the_report_is_downloaded_successfully(shared_data, nhs_number):
     assert os.path.exists(shared_data['report_download_path']), f"Downloaded file not found: {shared_data['report_download_path']}"