--- a/dav/sync.c	Sun Apr 29 11:16:41 2018 +0200
+++ b/dav/sync.c	Sun Apr 29 11:48:12 2018 +0200
@@ -1369,6 +1369,7 @@
         UcxList *local_tags = sync_get_file_tags(dir, local, &tags_changed);
         if(tags_changed) {
             switch(dir->tagconfig->conflict) {
+                case TAG_NO_CONFLICT:
                 case TAG_KEEP_LOCAL: {
                     store_empty_tags = TRUE;
                     tags = local_tags;