diff --git a/doc/www/favicon.ico b/doc/www/favicon.ico
new file mode 100644
index 0000000..9ba02a2
Binary files /dev/null and b/doc/www/favicon.ico differ
diff --git a/doc/www/index.html b/doc/www/index.html
index 0d9ee68..955cb90 100644
--- a/doc/www/index.html
+++ b/doc/www/index.html
@@ -95,9 +95,13 @@
 	<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>