Updated timeout and deepnews model

Author: CodexVeritas

run_bots.py

@@ -414,13 +414,8 @@ def get_default_bot_dict() -> dict[str, RunBotConfig]:  # NOSONAR
     sonnet_4_5_name = "anthropic/claude-sonnet-4-5-20250929"
     gemini_2_5_pro = "openrouter/google/gemini-2.5-pro"  # Used to be gemini-2.5-pro-preview (though automatically switched to regular pro when preview was deprecated)
     gemini_3_pro = "openrouter/google/gemini-3-pro-preview"
-<<<<<<< HEAD
     gemini_default_timeout = 5 * 60
-    deepnews_model = "asknews/deep-research/high-depth/claude-sonnet-4-5-20250929"  # Switched from claude-sonnet-4-20250514 in Nov 2025
-=======
-    gemini_default_timeout = 120
     deepnews_model = "asknews/deep-research/medium-depth/claude-sonnet-4-5-20250929"  # Switched from claude-sonnet-4-20250514 to sonnet 4.5 in Nov 2025. Switched from high to medium depth on Nov 25th, 2025
->>>>>>> 5af6a2d (Set up caching for asknews calls)
     roughly_sonnet_4_cost = 0.25190
     roughly_gpt_5_high_cost = 0.37868
     roughly_gpt_5_cost = 0.19971