diff --git a/app/song/api/routers/v1/song.py b/app/song/api/routers/v1/song.py
index 486d7ab..13b39f3 100644
--- a/app/song/api/routers/v1/song.py
+++ b/app/song/api/routers/v1/song.py
@@ -19,11 +19,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.database.session import get_session
 from app.home.models import Project
 from app.lyric.models import Lyric
-<<<<<<< HEAD
-from app.song.models import Song
-=======
 from app.song.models import Song, SongTimestamp
->>>>>>> main
 from app.song.schemas.song_schema import (
     GenerateSongRequest,
     GenerateSongResponse,