differential 1.1 brings three-way merges to DuckDB: merge branches and snapshots, fast-forward, resolve typed conflicts with a table, merge schemas, use S3.