diff -r ddb5e8f2a43d -r 3070d72f54af docs/html/resolve-conflicts.html
--- a/docs/html/resolve-conflicts.html	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/html/resolve-conflicts.html	Sat Aug 05 13:35:27 2017 +0200
@@ -66,7 +66,7 @@
 <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>
+<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>
 <!-- end content -->
 </body>