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.