Fix merge conflicts.

config.py

@@ -55,6 +55,10 @@ def __init__(
         hide_time_to_first_response: bool,
         ignore_user: List[str],
         labels_to_measure: List[str],
+        enable_mentor_count: str,
+        min_mentor_comments: str,
+        max_comments_eval: str,
+        heavily_involved_cutoff: str ,
         search_query: str,
     ):
         self.gh_app_id = gh_app_id
@@ -196,9 +200,9 @@ def get_env_vars(test: bool = False) -> EnvVars:
         hide_time_to_first_response,
         ignore_users_list,
         labels_to_measure_list,
-        search_query,
         enable_mentor_count,
-        min_mentor_comments
+        min_mentor_comments,
         max_comments_eval,
-        heavily_involved_cutoff
+        heavily_involved_cutoff,
+        search_query,
     )

test_config.py

@@ -118,6 +118,10 @@ def test_get_env_vars_with_github_app(self):
             False,
             [],
             [],
+            "FALSE",
+            "10",
+            "20",
+            "3",
             SEARCH_QUERY,
         )
         result = get_env_vars(True)
@@ -157,6 +161,10 @@ def test_get_env_vars_with_token(self):
             False,
             [],
             [],
+            "FALSE",
+            "10",
+            "20",
+            "3",
             SEARCH_QUERY,
         )
         result = get_env_vars(True)
@@ -195,6 +203,10 @@ def test_get_env_vars_optional_values(self):
             True,
             [],
             ["waiting-for-review", "waiting-for-manager"],
+            "FALSE",
+            10,
+            20,
+            3,
             SEARCH_QUERY,
         )
         result = get_env_vars(True)

test_issue_metrics.py

@@ -123,7 +123,7 @@ def test_get_env_vars_missing_query(self):
 
         # Call the function and check that it raises a ValueError
         with self.assertRaises(ValueError):
-            get_env_vars()
+            get_env_vars(test=True)
 
 
 class TestMain(unittest.TestCase):