Update scan_id on worktree entries when there is a conflict

Forgetting to do this meant we were unable to sync changes with reconnecting
guests in some cases.

crates/collab/src/db.rs

@@ -2184,6 +2184,7 @@ impl Database {
                         worktree_entry::Column::MtimeNanos,
                         worktree_entry::Column::IsSymlink,
                         worktree_entry::Column::IsIgnored,
+                        worktree_entry::Column::ScanId,
                     ])
                     .to_owned(),
                 )