Resolved merge conflicts

Author: victor-soares-ibm

pages/base_page.py

@@ -91,6 +91,7 @@ def bowel_cancer_screening_system_header_is_displayed(self) -> None:
     def main_menu_header_is_displayed(self) -> None:
         expect(self.main_menu__header).to_contain_text("Main Menu")
 
+   
     def bowel_cancer_screening_page_title_contains_text(self, text: str) -> None:
         """Asserts that the page title contains the specified text.
 

tests/test_reports_page.py

@@ -63,7 +63,7 @@ def test_reports_page_navigation(page: Page) -> None:
 
     # Dashboard opens as expected TODO - this step may be failing legitimately
     # ReportsPage(page).go_to_dashboard()
-    # BasePage(page).bowel_cancer_screening_page_header_contains_text("Dashboard")
+    # BasePage(page).bowel_cancer_screening_page_title_contains_text("Dashboard")
     # BasePage(page).click_back_button()
 
     # QA Report : Dataset Completion link is visible