diff --git a/doc/www/index.html b/doc/www/index.html
index 955cb90..0d9ee68 100644
--- a/doc/www/index.html
+++ b/doc/www/index.html
@@ -95,13 +95,9 @@
 	<h2 class="consol">$ svn co https://svn.subgra.de/ben/projects/fpgafs</h2>
 
 	<h2 class="title">Contact</h2><a name="contact" id="contact"></a>
-<<<<<<< .mine
-	<p>Benjamin Krill: ben@codiert.org</p>
-=======
 	<p>Benjamin Krill: ben@codiert.org</p>
 
 	<h2 class="footer">$Id$</h3>
->>>>>>> .r443
 </div>
 
 </body>