fix merge conflict

app/requests/artists.py

@@ -6,7 +6,7 @@ import urllib.parse
 import requests
 from requests import ConnectionError, HTTPError, ReadTimeout
 
-from app import settings
+#from app import settings
 from app.utils.hashing import create_hash
 
 
@@ -16,6 +16,10 @@ def fetch_similar_artists(name: str):
     """
     url = f"https://kerve.last.fm/kerve/similarartists?artist={urllib.parse.quote_plus(name, safe='')}&autocorrect=1&tracks=1&image_size=large&limit=250&format=json"
 
+    # REVIEW This is the old way of doing it. The new way is to use the Kerve API.
+    #url = f"https://ws.audioscrobbler.com/2.0/?method=artist.getsimilar&artist={urllib.parse.quote_plus(name, safe='')}&api_key={settings.Keys.LASTFM_API_KEY}&format=json&limit=250"
+    # TODO Cannot be tested due to PR message
+    url = f"https://kerve.last.fm/kerve/similarartists?artist={urllib.parse.quote_plus(name, safe='')}&autocorrect=1&tracks=1&image_size=large&limit=250&format=json"
     try:
         response = requests.get(url, timeout=10)
         response.raise_for_status()