diff --git a/src/assets/favicon.svg b/src/assets/favicon.svg
index 0243833..9d5bc33 100644
--- a/src/assets/favicon.svg
+++ b/src/assets/favicon.svg
@@ -1,18 +1,5 @@
-<<<<<<< HEAD
 <svg width="192" height="192" viewBox="0 0 192 192" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect width="192" height="192" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M168 120V168H120V156H156V120H168ZM168 72V24H120V36H156V72H168ZM72 36V24H24V72H36V36H72ZM72 156H36V120H24V168H72V156Z" fill="#585858"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M60 60H84V84H108V60H132V84V108V132H108V108H84V132H60V108V84V60Z" fill="#585858"/>
-=======
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="NIRlogo_200x200_favicon">
-<rect width="200" height="200" fill="white"/>
-<g id="Group">
-<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M20 80H30V95H50V80H60V95V105V120H50V105H30V120H20V105V95V80Z" fill="black"/>
-<path id="Combined Shape_2" fill-rule="evenodd" clip-rule="evenodd" d="M140 90V100V110V120H150V110H165H165H165.002C167.977 110 170.635 109.325 172.858 108.094C175.08 106.864 176.866 105.078 178.096 102.856C179.327 100.633 180.002 97.9751 180.002 95C180.002 92.0249 179.327 89.3666 178.096 87.1444C176.866 84.9221 175.08 83.1361 172.858 81.9055C170.635 80.675 167.977 80 165.002 80C165.001 80 165.001 80 165 80H150H140V90ZM165 90H150V100H165C165 100 165 100 165 100C166.175 99.9999 167.137 99.7637 167.88 99.3524C168.514 99.0014 169.001 98.5142 169.352 97.8804C169.763 97.1375 170 96.175 170 95C170 93.825 169.763 92.8625 169.352 92.1196C169.001 91.4858 168.514 90.9986 167.88 90.6476C167.137 90.2363 166.175 90.0001 165 90C165 90 165 90 165 90Z" fill="black"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M108.75 80L90 105V80H80V120H91.25L110 95V120H120V80H108.75Z" fill="black"/>
-<path id="Combined Shape_3" fill-rule="evenodd" clip-rule="evenodd" d="M160 130V160H130V150H150V130H160ZM160 70V40H130V50H150V70H160ZM70 50V40H40V70H50V50H70ZM70 150H50V130H40V160H70V150Z" fill="black"/>
-</g>
-</g>
->>>>>>> 95638cd89c56dc0df814652a8e7d1cb399d10ef1
 </svg>