diff --git a/zspotify/track.py b/zspotify/track.py
index eebf2432..76fd5f44 100644
--- a/zspotify/track.py
+++ b/zspotify/track.py
@@ -12,12 +12,8 @@ from tqdm import tqdm
 from const import TRACKS, ALBUM, NAME, ITEMS, DISC_NUMBER, TRACK_NUMBER, IS_PLAYABLE, ARTISTS, IMAGES, URL, \
     RELEASE_DATE, ID, TRACKS_URL, SAVED_TRACKS_URL, SPLIT_ALBUM_DISCS, ROOT_PATH, DOWNLOAD_FORMAT, CHUNK_SIZE, \
     SKIP_EXISTING_FILES, ANTI_BAN_WAIT_TIME, OVERRIDE_AUTO_WAIT, BITRATE, CODEC_MAP, EXT_MAP, DOWNLOAD_REAL_TIME
-<<<<<<< HEAD
-from utils import fix_filename, set_audio_tags, set_music_thumbnail, create_download_directory
-=======
 from utils import sanitize_data, set_audio_tags, set_music_thumbnail, create_download_directory, \
     get_directory_song_ids, add_to_directory_song_ids
->>>>>>> fixes#137
 from zspotify import ZSpotify