Resolve merge conflict

Author: Cykotech

src/App.tsx

@@ -0,0 +1,5 @@
+function App() {
+  return <h1>Code Café Community</h1>;
+}
+
+export default App;