diff --git a/assets/svg/1f1f2-1f1f6.svg b/assets/svg/1f1f2-1f1f6.svg
index e6def128..4da981a5 100644
--- a/assets/svg/1f1f2-1f1f6.svg
+++ b/assets/svg/1f1f2-1f1f6.svg
@@ -1 +1,5 @@
-
\ No newline at end of file
+<<<<<<< Updated upstream
+
+=======
+
+>>>>>>> Stashed changes