fix: conflicts

Author: NANAARUN

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fluent-story",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "",
 	"main": "dist",
 	"files": [

src/index.tsx

@@ -188,7 +188,12 @@ const Stories: FC<{
 		...new URLSearchParams(window.location.search).entries(),
 	].find(([query]) => query === "component")?.[1];
 	const Component = compName && stories[compName];
+<<<<<<< HEAD
 	if (compName) return Component ? h(Component) : h("Component not found");
+=======
+
+	if (compName) return Component ? <Component /> : <>"Component not found"</>;
+>>>>>>> c9993a6bcb4d4bb30d05682f15e1f74c480095af
 
 	const handleInputChange = (value: number, field: string) => {
 		setFrameDimension(dim => ({ ...dim, [field]: `${value}px` }));

src/logo.tsx

@@ -0,0 +1,55 @@
+import React from "react";
+
+export default () => (
+	<svg
+		width="1659"
+		height="272"
+		viewBox="0 0 1659 272"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg">
+		<path
+			d="M0 212.318H44.2841V125.795H129.477V89.2841H44.2841V39.375H138.682V2.86364H0V212.318Z"
+			fill="black"
+		/>
+		<path
+			d="M211.219 2.86364H167.651V212.318H211.219V2.86364Z"
+			fill="black"
+		/>
+		<path
+			d="M346.858 145.432C346.96 166.5 332.54 177.545 316.892 177.545C300.426 177.545 289.79 165.989 289.688 147.477V55.2273H246.119V155.25C246.222 191.966 267.699 214.364 299.301 214.364C322.926 214.364 339.903 202.193 346.96 183.784H348.597V212.318H390.426V55.2273H346.858V145.432Z"
+			fill="black"
+		/>
+		<path
+			d="M496.866 215.386C535.73 215.386 561.912 196.466 568.048 167.318L527.753 164.659C523.355 176.625 512.105 182.864 497.582 182.864C475.798 182.864 461.991 168.443 461.991 145.023V144.92H568.969V132.955C568.969 79.5682 536.651 53.1818 495.128 53.1818C448.901 53.1818 418.935 86.0114 418.935 134.489C418.935 184.295 448.491 215.386 496.866 215.386ZM461.991 117.92C462.912 100.023 476.514 85.7046 495.844 85.7046C514.764 85.7046 527.855 99.2046 527.957 117.92H461.991Z"
+			fill="black"
+		/>
+		<path
+			d="M640.969 121.5C641.071 101.25 653.139 89.3864 670.73 89.3864C688.219 89.3864 698.753 100.841 698.651 120.068V212.318H742.219V112.295C742.219 75.6818 720.741 53.1818 688.014 53.1818C664.696 53.1818 647.821 64.6364 640.764 82.9432H638.923V55.2273H597.401V212.318H640.969V121.5Z"
+			fill="black"
+		/>
+		<path
+			d="M860.114 55.2273H830.557V17.5909H786.989V55.2273H765.511V87.9546H786.989V169.773C786.784 200.557 807.75 215.795 839.352 214.466C850.602 214.057 858.58 211.807 862.977 210.375L856.125 177.955C853.977 178.364 849.375 179.386 845.284 179.386C836.591 179.386 830.557 176.114 830.557 164.045V87.9546H860.114V55.2273Z"
+			fill="black"
+		/>
+		<path
+			d="M1077.67 55.2273H1102.22C1101.09 23.625 1071.95 0 1031.45 0C991.355 0 959.855 23.3182 959.855 58.5C959.855 86.7273 980.31 103.5 1013.04 112.909L1038.81 120.273C1060.9 126.409 1080.54 134.182 1080.54 155.045C1080.54 177.955 1058.45 193.091 1029.4 193.091C1004.45 193.091 982.355 182.045 980.31 158.318H954.128C956.582 192.682 984.401 216 1029.4 216C1077.67 216 1105.08 189.409 1105.08 155.455C1105.08 116.182 1067.86 103.5 1046.17 97.7727L1024.9 92.0455C1009.36 87.9546 984.401 79.7727 984.401 57.2727C984.401 37.2273 1002.81 22.5 1030.63 22.5C1055.99 22.5 1075.22 34.5682 1077.67 55.2273Z"
+			fill="black"
+		/>
+		<path
+			d="M1211.83 55.2273H1178.28V17.5909H1154.15V55.2273H1130.42V75.6818H1154.15V173.864C1154.15 201.273 1176.24 214.364 1196.69 214.364C1205.69 214.364 1211.42 212.727 1214.69 211.5L1209.78 189.818C1207.74 190.227 1204.47 191.045 1199.15 191.045C1188.51 191.045 1178.28 187.773 1178.28 167.318V75.6818H1211.83V55.2273Z"
+			fill="black"
+		/>
+		<path
+			d="M1310.27 215.591C1352.81 215.591 1381.45 183.273 1381.45 134.591C1381.45 85.5 1352.81 53.1818 1310.27 53.1818C1267.72 53.1818 1239.09 85.5 1239.09 134.591C1239.09 183.273 1267.72 215.591 1310.27 215.591ZM1310.27 193.909C1277.95 193.909 1263.22 166.091 1263.22 134.591C1263.22 103.091 1277.95 74.8636 1310.27 74.8636C1342.59 74.8636 1357.31 103.091 1357.31 134.591C1357.31 166.091 1342.59 193.909 1310.27 193.909Z"
+			fill="black"
+		/>
+		<path
+			d="M1418.29 212.318H1442.43V112.909C1442.43 91.6364 1459.2 76.0909 1482.11 76.0909C1488.55 76.0909 1495.2 77.3182 1496.84 77.7273V53.1818C1494.08 52.9773 1487.74 52.7727 1484.16 52.7727C1465.34 52.7727 1448.97 63.4091 1443.25 78.9546H1441.61V55.2273H1418.29V212.318Z"
+			fill="black"
+		/>
+		<path
+			d="M1545.78 271.227C1567.56 271.227 1582.9 259.67 1592 235.227L1658.89 55.6364L1632.5 55.2273L1589.14 180.409H1587.5L1544.14 55.2273H1517.96L1576.05 213.136L1571.55 225.409C1562.75 249.341 1551.91 251.591 1534.32 247.091L1528.18 268.364C1530.64 269.591 1537.59 271.227 1545.78 271.227Z"
+			fill="black"
+		/>
+	</svg>
+);