validate

index.html

@@ -78,9 +78,6 @@ <h1>A PASSION FOR SOFTWARE</h1>
                 <div class="col-lg-12">
                     <h1>About me</h1>
                     <img src="/res/logo.png"><br><br>
-<<<<<<< HEAD
-                    <p>Hi, my name is Torsten Bergmann. I' am </p>
-=======
                     <p align="left">
                         Hi - my name is <b>Torsten Bergmann</b>.<br><br>I'm a Father, professional IT Architect and Coder, (Software) Engineer, Advisor, 
                         Hitchhiker and Geek - all in one person. My internet nickname since many years is <b>astares</b> - this is why you ended up here - 
@@ -112,6 +109,7 @@ <h1>About me</h1>
 
                         I am also involved in the open source community to follow Alan Kay's famous quote, "The best way to predict the future is to invent it.". 
                         You can check out some of my projects below.
+                        </p>
                 </div>
             </div>
         </div>