fix merge conflict

server/app/lib/playlistlib.py

@@ -5,12 +5,17 @@ This library contains all the functions related to playlists.
 import os
 import random
 import string
-from PIL import Image, ImageSequence
+
+from app import api
+from app import exceptions
+from app import instances
+from app import models
+from app import settings
+from app.lib import trackslib
+from PIL import Image
+from PIL import ImageSequence
 from progress.bar import Bar
 from werkzeug import datastructures
-from app import api, instances, models, exceptions, settings
-
-from app.lib import trackslib
 
 TrackExistsInPlaylist = exceptions.TrackExistsInPlaylist
 
@@ -31,7 +36,8 @@ def add_track(playlistid: str, trackid: str):
 
             try:
                 playlist.add_track(track)
-                instances.playlist_instance.add_track_to_playlist(playlistid, track)
+                instances.playlist_instance.add_track_to_playlist(
+                    playlistid, track)
                 return
             except TrackExistsInPlaylist as e:
                 return {"error": str(e)}, 409
@@ -63,7 +69,8 @@ def save_p_image(file: datastructures.FileStorage, pid: str):
     """
     img = Image.open(file)
 
-    random_str = "".join(random.choices(string.ascii_letters + string.digits, k=5))
+    random_str = "".join(
+        random.choices(string.ascii_letters + string.digits, k=5))
 
     img_path = pid + str(random_str) + ".webp"
     full_path = os.path.join(settings.APP_DIR, "images", "playlists", img_path)