remove merge line

Author: ecmatz

docs/content/m1/contact_page.html

@@ -106,7 +106,6 @@ <h1>Contact the Authors<a class="headerlink" href="#contact-the-authors" title="
 <section id="ethan-matzek">
 <h2>Ethan Matzek<a class="headerlink" href="#ethan-matzek" title="Link to this heading"></a></h2>
 <p><strong>Email:</strong> <a class="reference external" href="mailto:ecmatzek&#37;&#52;&#48;gmail&#46;com">ecmatzek<span>&#64;</span>gmail<span>&#46;</span>com</a></p>
-<<<<<<< HEAD
 <p>Ethan Matzek is a graduate Computer Science student at Wright State University who specializes in hardware and software support in physiological sensing, and virtual reality development. He wrote up most of the documentation for the first, second, fourth, and fifth modules, and was the project lead for this site. Ethan is an avid pianist, reader, and gym-goer, and has found success in his paper <em>VRMonic: A VR Piano Playing Form Trainer</em> which was demoed at the AIxVR 2024 conference in Los Angeles. He attended CVPR 2024 as an demo exhibitionist for physiological sensing in VR. He also publish a paper titled <em>VitaMaze: A VR Exergame Driven using Feedback from Physiological Sensors</em> which was published at AIxVR 2025.</p>
 =======
 <p>Ethan Matzek is a PhD Computer Science student at Wright State University who specializes in virtual reality development in Unity. He wrote up most of the documentation for the first, second, fourth, and fifth modules, and was the project lead for this site. Ethan is an avid pianist, reader, and gym-goer, and has found success in his paper <em>VRMonic: A VR Piano Playing Form Trainer</em> which was demoed at the AIxVR 2024 conference in Los Angeles. Recently, he attended CVPR 2024 as an demo exhibitionist for physiological sensing in VR.</p>
@@ -170,4 +169,4 @@ <h2>Matt Duver<a class="headerlink" href="#matt-duver" title="Link to this headi
   </script> 
 
 </body>
-</html>
+</html>