diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg
index d96f4933b..89965c3d8 100644
--- a/fonts/forkawesome-webfont.svg
+++ b/fonts/forkawesome-webfont.svg
@@ -4,6 +4,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 2020-4-12: Created with FontForge (http://fontforge.org)
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
@@ -27,6 +28,12 @@ Created by FontForge 20170924 at Sun Apr 12 18:44:30 2020
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
+=======
+2019-11-21: Created with FontForge (http://fontforge.org)
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
 Created by FontForge 20190801 at Thu Nov 21 23:09:04 2019
  By Helmut K. C. Tessarek
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
@@ -47,6 +54,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
     underline-position="-179.2"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     unicode-range="U+0020-F36A"
 =======
@@ -55,6 +63,9 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
 =======
     unicode-range="U+0020-F338"
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
+=======
+    unicode-range="U+0020-F338"
+>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
 =======
     unicode-range="U+0020-F338"
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
index ef2e643f5..206898b56 100644
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@@ -2,6 +2,7 @@
   "checksum": {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     "previous": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a",
     "current": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a"
@@ -13,6 +14,10 @@
     "previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
     "current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
+=======
+    "previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
+    "current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
+>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
 =======
     "previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
     "current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
diff --git a/src/icons/icons.yml b/src/icons/icons.yml
index e9b2e36a9..37ce04e14 100644
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@@ -7445,6 +7445,7 @@ icons:
       - Brand Icons
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
   - name:       Funkwhale
@@ -7877,3 +7878,5 @@ icons:
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
 =======
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
+=======
+>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale