v2.9.0 — Sync conflict keeps both copies