diff -r 3070d72f54af -r 0e36bb75a732 docs/html/resolve-conflicts.html
--- a/docs/html/resolve-conflicts.html	Sat Aug 05 13:35:27 2017 +0200
+++ b/docs/html/resolve-conflicts.html	Sun Aug 06 14:41:20 2017 +0200
@@ -4,7 +4,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <meta name="generator" content="pandoc" />
-  <title></title>
+  <title>dav-sync resolve-conflicts</title>
   <style type="text/css">code{white-space: pre;}</style>
   <link rel="stylesheet" href="davdoc.css" type="text/css" />
 </head>
@@ -64,7 +64,9 @@
 
 <!-- begin content -->
 <div class="content">
-<h1 id="dav-sync-resolve-conflicts">dav-sync resolve-conflicts</h1>
+<div id="header">
+<h1 class="title">dav-sync resolve-conflicts</h1>
+</div>
 <p><strong><code>resolve-conflicts &lt;directory&gt;</code></strong></p>
 <p>Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command. In other words: by executing this command you assert that <em>you</em> have resolved the conflicts.</p>
 </div>