diff -r 78a25071ed88 -r 3dffe58a573f docs/html/resolve-conflicts.html
--- a/docs/html/resolve-conflicts.html	Wed Apr 10 13:48:44 2019 +0200
+++ b/docs/html/resolve-conflicts.html	Wed Apr 10 13:50:24 2019 +0200
@@ -53,6 +53,7 @@
 						<li><a href="pull.html">pull</a></li>
 						<li><a href="push.html">push</a></li>
 						<li><a href="archive.html">archive</a></li>
+                                                <li><a href="list-conflicts.html">list-conflicts</a></li>
 						<li><a href="resolve-conflicts.html">resolve-conflicts</a></li>
 						<li><a href="delete-conflicts.html">delete-conflicts</a></li>
 						<li><a href="trash-info.html">trash-info</a></li>
@@ -77,7 +78,7 @@
 <h1 class="title">dav-sync resolve-conflicts</h1>
 </div>
 <p><strong><code>dav-sync 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>
+<p>Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that <em>you</em> have resolved the conflicts. Usually you will not need this command.</p>
 </div>
 <!-- end content -->
 </body>