diff -r 5577d3eae04c -r fa48ab29abd2 docs/html/resolve-conflicts.html
--- a/docs/html/resolve-conflicts.html	Fri Aug 04 20:03:21 2017 +0200
+++ b/docs/html/resolve-conflicts.html	Sat Aug 05 09:36:03 2017 +0200
@@ -64,7 +64,9 @@
 
 <!-- begin content -->
 <div class="content">
-
+<h1 id="dav-sync-resolve-conflicts">dav-sync resolve-conflicts</h1>
+<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.</p>
 </div>
 <!-- end content -->
 </body>