fix merge conflict

server/app/api/playlist.py

@@ -1,14 +1,15 @@
 """
 Contains all the playlist routes.
 """
-
 from datetime import datetime
-from flask import Blueprint, request
-from app import instances, api
-from app.lib import playlistlib
-from app import models
+from app import api
 from app import exceptions
+from app import instances
+from app import models
 from app import serializer
+from app.lib import playlistlib
+from flask import Blueprint
+from flask import request
 
 playlist_bp = Blueprint("playlist", __name__, url_prefix="/")