diff --git a/spotdl/handle.py b/spotdl/handle.py
index f4168fd..f76f46c 100644
--- a/spotdl/handle.py
+++ b/spotdl/handle.py
@@ -5,10 +5,6 @@ import logging
 import yaml
 import argparse
 import mimetypes
-<<<<<<< HEAD
-=======
-
->>>>>>> --list flag accepts only text files using mimetypes
 import os
 
 import spotdl