diff -r 046b869a1c49 -r 93bbeb00385c test/bin-test/test-dav-sync.sh
--- a/test/bin-test/test-dav-sync.sh	Mon Aug 19 19:19:08 2019 +0200
+++ b/test/bin-test/test-dav-sync.sh	Sat Aug 24 23:34:16 2019 +0200
@@ -92,6 +92,7 @@
 #
 do_test "dav-sync push (1)" test-dav-sync-push1.sh
 do_test "dav-sync pull (1)" test-dav-sync-pull1.sh
+do_test "dav-sync conflict (1)" test-dav-sync-conflict.sh
 
 # cleanup
 $DAV_BIN rm dav-test-repo/sync/test1 > /dev/null 2>&1