and add docs/dev/timestamp-conflict-resolution.md to document the details of the conflict resolution algorithm. Refs scylladb/scylladb#14063 Signed-off-by: Benny Halevy <bhalevy@scylladb.com>