Fix Issues

tools/data_analyst.py

@@ -64,11 +64,7 @@ def data_analyst_tools():
             func=StockPriceTool,
             args_schema=StockPriceCheckInput,
             description="Function to get current stock prices.",
-<<<<<<< HEAD
-        ),
-=======
         )
->>>>>>> 594c18622dd698f1854229dda280817492475d75
         # StructuredTool.from_function(
         #     func=HistoricalStockPricesTool,
         #     args_schema=HistoricalStockPricesInput,

tools/investment_advisor.py

@@ -5,10 +5,7 @@ from langchain.tools import StructuredTool
 import yfinance as yf
 from typing import List
 from datetime import datetime,timedelta
-<<<<<<< HEAD
 import pandas as pd
-=======
->>>>>>> 594c18622dd698f1854229dda280817492475d75
 
 def investment_advisor_tools():