resolving conflicts

frontend/app/(main)/about/page.tsx

@@ -0,0 +1,16 @@
+"use server"
+
+export default async function About() {
+	return (
+		<div>
+			<div>
+				About us
+				will :
+				+explain what we
+				+pricing
+
+				+plannign for what will come next
+			</div>
+		</div>
+	)
+}