removed merge conflicts

removed_sites.json

@@ -70,14 +70,6 @@
     "username_claimed": "dens",
     "username_unclaimed": "noonewouldeverusethis7"
   },
-  "furaffinity": {
-    "errorMsg": "user cannot be found",
-    "errorType": "message",
-    "url": "https://www.furaffinity.net/user/{}",
-    "urlMain": "https://www.furaffinity.net",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis777777"
-  },
   "gpodder.net": {
     "errorType": "status_code",
     "url": "https://gpodder.net/user/{}",

removed_sites.md

@@ -421,24 +421,6 @@ Good-bye [Google Plus](https://en.wikipedia.org/wiki/Google%2B)...
 ```
 
 
-## Furaffinity
-
-As of 2020-02-23, Furaffinity returns false postives because they are now using Cloudflair, which prevents Sherlock from checking if the user
-exists or not.
-
-```
-  "furaffinity": {
-    "errorMsg": "user cannot be found",
-    "errorType": "message",
-    "rank": 0,
-    "url": "https://www.furaffinity.net/user/{}",
-    "urlMain": "https://www.furaffinity.net",
-    "username_claimed": "blue",
-    "username_unclaimed": "noonewouldeverusethis777777"
-  },
-```
-
-
 ## InsaneJournal
 
 As of 2020-02-23, InsaneJournal returns false positive, when providing a username which contains a period.
@@ -1546,4 +1528,4 @@ As of 25-07-2022, radio_echo_msk is now no longer functional
     "username_claimed": "blue",
     "username_unclaimed": "noonewouldeverusethis7"
   }
-```
+```

sherlock/resources/data.json

@@ -2681,5 +2681,13 @@
     "urlMain": "https://www.zoomit.ir",
     "username_claimed": "kossher",
     "username_unclaimed": "noonewouldeverusethis7"
+  },
+  "furaffinity": {
+    "errorMsg": "This user cannot be found.",
+    "errorType": "message",
+    "url": "https://www.furaffinity.net/user/{}",
+    "urlMain": "https://www.furaffinity.net",
+    "username_claimed": "jesus",
+    "username_unclaimed": "noonewouldeverusethis7"
   }
 }