diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg
index 3e9d25eb0..8daa4d893 100644
--- a/fonts/forkawesome-webfont.svg
+++ b/fonts/forkawesome-webfont.svg
@@ -2,6 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!--
 <<<<<<< 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">
@@ -13,6 +14,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>
+=======
+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
@@ -31,8 +38,12 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
     bbox="-0.653061 -410 2304.15 1538"
     underline-thickness="89.6"
     underline-position="-179.2"
+<<<<<<< HEAD
 <<<<<<< HEAD
     unicode-range="U+0020-F36A"
+=======
+    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 24706cef1..a4ec6f1d8 100644
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@@ -1,8 +1,13 @@
 {
   "checksum": {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "previous": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a",
     "current": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a"
+=======
+    "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 8a3147211..ed31c3df7 100644
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@@ -7443,6 +7443,7 @@ icons:
       - science
     categories:
       - Brand Icons
+<<<<<<< HEAD
 <<<<<<< HEAD
 
   - name:       Funkwhale
@@ -7871,3 +7872,5 @@ icons:
       - Brand Icons
 =======
 >>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
+=======
+>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale