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