diff -r c743721d566f -r 5577d3eae04c docs/src/resolve-conflicts.md
--- a/docs/src/resolve-conflicts.md	Thu Aug 03 18:29:00 2017 +0200
+++ b/docs/src/resolve-conflicts.md	Fri Aug 04 20:03:21 2017 +0200
@@ -0,0 +1,7 @@
+dav-sync resolve-conflicts
+==========================
+
+**`resolve-conflicts <directory>`**
+
+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.
+