jira:NYJ-1540 desc: handle conflict

@@ -7,11 +7,7 @@ from langchain_core.messages import SystemMessage, HumanMessage
 from langchain_openai import ChatOpenAI
 
 try:
-<<<<<<<< HEAD:src/football_replay_match/core/football_replay_match_live.py
-    from football_replay_match.util.llm_video_content import contents as video_contents
-========
     from .llm_image import Video2Frame
->>>>>>>> b6bd61f9eadc8b70a6ff2e7925f45fc7a9ed39f0:src/football_replay_match/core/utils/football_replay_match_live.py
 except:
     from llm_image import Video2Frame
 

@@ -6,11 +6,7 @@ from langchain_core.messages import SystemMessage, HumanMessage
 from langchain_openai import ChatOpenAI
 
 try:
-<<<<<<<< HEAD:src/football_replay_match/core/football_replay_video_event_by_llm.py
-    from football_replay_match.util.llm_video_content import contents as video_contents
-========
     from .llm_image import Video2Frame
->>>>>>>> b6bd61f9eadc8b70a6ff2e7925f45fc7a9ed39f0:src/football_replay_match/core/utils/football_replay_video_event_by_llm.py
 except:
     from llm_image import Video2Frame