fixing conflicts and merging

index.html

@@ -16,12 +16,33 @@
         <img src="img/pp.jpg" width="200" />
     </header>
 
-    <nav>
+    <!--<nav>
         <ul>
             <li>Social</li>
             <li>Projects</li>
             <li>Contact</li>
         </ul>
+<<<<<<< HEAD
     </nav>
+=======
+    </nav>-->
+
+    <main>
+        <article>
+            <h5>Peter “Petrus Pistor” Baker II: Building a Quiet Revolution in Deaf Vlogging</h5>
+
+            <p>
+                Peter Baker II &mdash; known online as Petrus Pistor &mdash; is a community builder with a maker's mindset.
+                Based in Riverside County, California, he splits his days between on-the-ground hustle and a bigger mission:
+                creating a high-standard home for Deaf vloggers to grow, collaborate, and be seen. What started as a few livestream
+                experiments has evolved into a blueprint for a modern, Deaf-led creator ecosystem &mdash; clear rules, strong host standards,
+                captioned content, and a culture that rewards care as much as clout. Peter's idea is simple and stubborn: quality over chaos.
+                He's gathering Deaf creators who want structure &mdash; hosts who show up prepared, panels that stay on topic, and videos that are always
+                accessible (captioned and voiced when it helps the audience). He's not chasing drama; he's building repeatable systems so more Deaf
+                storytellers can shine without burning out.
+            </p>
+        </article>
+    </main>
+>>>>>>> c8000e41cc15a76985524dc31fcd32ba8e56f6f8
 </body>
 </html>