fix: resolve merge conflicts

svg/netbird.svg

@@ -1,21 +1 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="svg1203" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="0.02 69.9 512 372.2">
-<style type="text/css">
-	.st0{fill:#F68330;}
-	.st1{fill:#F35E32;}
-</style>
-<sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="namedview1205" inkscape:current-layer="layer1" inkscape:cx="334.86637" inkscape:cy="27.993009" inkscape:document-units="mm" inkscape:pagecheckerboard="0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:snap-global="false" inkscape:window-height="1335" inkscape:window-maximized="1" inkscape:window-width="2560" inkscape:window-x="1920" inkscape:window-y="0" inkscape:zoom="1.4289282" pagecolor="#ffffff" showgrid="false" units="px" width="650px">
-	</sodipodi:namedview>
-<defs>
-	
-		<inkscape:path-effect apply_no_radius="true" apply_with_radius="true" chamfer_steps="1" effect="fillet_chamfer" flexible="false" hide_knots="false" id="path-effect57379" is_visible="true" lpeversion="1" method="auto" mode="F" only_selected="false" radius="17" satellites_param="F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1" unit="px" use_knot_distance="true">
-		</inkscape:path-effect>
-</defs>
-<g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
-	
-		<g id="g23427" transform="translate(-0.38486311,1.9008189)" inkscape:export-filename="/home/braginini/Downloads/netbird-logo-dark.png" inkscape:export-xdpi="329.58896" inkscape:export-ydpi="329.58896">
-		<path id="path30" class="st0" d="M364.3,68c-61.8,5.7-92.5,41.3-104.1,59.3l-5.2,9.1c-0.4,0.8-0.6,1.3-0.6,1.3l-0.1-0.1    L79.5,440.2h218L512.4,68H364.3"/>
-		<path id="path32" class="st0" d="M297.5,440.2L0.4,125c0,0,336-90.2,368.7,191.4L297.5,440.2"/>
-		<path id="path34" class="st1" d="M253.5,138.9l-91.2,157.9l135.2,143.4l71.6-124C357.8,219.3,310.6,166.5,253.5,138.9"/>
-	</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="svg1203" x="0" y="0" version="1.1" viewBox="0.02 69.9 512 372.2"><style>.st0{fill:#f68330}</style><g id="layer1"><g id="g23427" transform="translate(-.385 1.9)"><path id="path30" d="M364.3 68c-61.8 5.7-92.5 41.3-104.1 59.3l-5.2 9.1c-.4.8-.6 1.3-.6 1.3l-.1-.1L79.5 440.2h218L512.4 68z" class="st0"/><path id="path32" d="M297.5 440.2.4 125s336-90.2 368.7 191.4z" class="st0"/><path id="path34" d="m253.5 138.9-91.2 157.9 135.2 143.4 71.6-124c-11.3-96.9-58.5-149.7-115.6-177.3" style="fill:#f35e32"/></g></g></svg>