finished rebase and fixed issues

backend/onyx/agents/agent_search/basic/graph_builder.py

@@ -85,7 +85,7 @@ if __name__ == "__main__":
 
     graph = basic_graph_builder()
     compiled_graph = graph.compile()
-    input = BasicInput(logs="")
+    input = BasicInput(_unused=True)
     primary_llm, fast_llm = get_default_llms()
     with get_session_context_manager() as db_session:
         config, _ = get_test_config(

backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py

@@ -156,13 +156,8 @@ def main_graph_builder(test_mode: bool = False) -> StateGraph:
     )
 
     graph.add_edge(
-<<<<<<< HEAD
-        start_key="agent_search_start",
-        end_key="generate_initial_answer_subgraph",
-=======
         start_key="start_agent_search",
-        end_key="initial_search_sq_subgraph",
+        end_key="generate_initial_answer_subgraph",
->>>>>>> ab2510c4d (main nodes renaming)
     )
 
     graph.add_edge(
@@ -171,13 +166,8 @@ def main_graph_builder(test_mode: bool = False) -> StateGraph:
     )
 
     graph.add_edge(
-<<<<<<< HEAD
+        start_key=["generate_initial_answer_subgraph", "extract_entity_term"],
-        start_key=["generate_initial_answer_subgraph", "entity_term_extraction_llm"],
-        end_key="refined_answer_decision",
-=======
-        start_key=["initial_search_sq_subgraph", "extract_entity_term"],
         end_key="validate_refined_answer",
->>>>>>> ab2510c4d (main nodes renaming)
     )
 
     graph.add_conditional_edges(