chore: resolve merge

Author: rafaelsmf

website/docs/engine-flink/options.md

@@ -78,7 +78,7 @@ ALTER TABLE log_table SET ('table.log.ttl' = '7d');
 | table.kv.format                         | Enum     | COMPACTED                           | The format of the kv records in kv store. The default value is `COMPACTED`. The supported formats are `COMPACTED` and `INDEXED`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | table.log.tiered.local-segments         | Integer  | 2                                   | The number of log segments to retain in local for each table when log tiered storage is enabled. It must be greater than 0. The default value is 2.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | table.datalake.enabled                  | Boolean  | false                               | Whether enable lakehouse storage for the table. Disabled by default. When this option is set to `true` and the datalake tiering service is up, the table will be tiered and compacted into datalake format stored on lakehouse storage.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| table.datalake.format                   | Enum     | (None)                              | The data lake format of the table specifies the tiered Lakehouse storage format, such as Paimon, Iceberg, DeltaLake, or Hudi. Currently, only `paimon` is supported. Once the `table.datalake.format` property is configured, Fluss adopts the key encoding and bucketing strategy used by the corresponding data lake format. This means Fluss will use the same key encoding and bucketing as the selected data lake format. This ensures consistency in key encoding and bucketing, enabling seamless **Union Read** functionality across Fluss and Lakehouse. The `table.datalake.format` can be pre-defined before enabling `table.datalake.enabled`. This allows the data lake feature to be dynamically enabled on the table without requiring table recreation. If `table.datalake.format` is not explicitly set during table creation, the table will default to the format specified by the `datalake.format` configuration in the Fluss cluster. |
+| table.datalake.format                   | Enum     | (None)                              | Specifies the tiered Lakehouse storage format for the table. Supported formats: `Paimon`, `Iceberg`, and `Lance`. More formats (e.g., DeltaLake, Hudi) will be supported in the future. When set, Fluss uses the key encoding and bucketing strategy of the selected data lake format, ensuring consistency and enabling seamless **Union Read** across Fluss and Lakehouse. You can pre-define this option before enabling `table.datalake.enabled`, allowing dynamic activation of the data lake feature without recreating the table. If not set during table creation, the default format is taken from the `datalake.format` configuration in the Fluss cluster. |
 | table.datalake.freshness                | Duration | 3min                                | It defines the maximum amount of time that the datalake table's content should lag behind updates to the Fluss table. Based on this target freshness, the Fluss service automatically moves data from the Fluss table and updates to the datalake table, so that the data in the datalake table is kept up to date within this target. If the data does not need to be as fresh, you can specify a longer target freshness time to reduce costs.                                                                                                                                                                 |
 | table.datalake.auto-compaction          | Boolean | false | If true, compaction will be triggered automatically when tiering service writes to the datalake. It is disabled by default.                                                                                                                                                                |
 | table.merge-engine                      | Enum     | (None)                              | Defines the merge engine for the primary key table. By default, primary key table uses the [default merge engine(last_row)](table-design/table-types/pk-table/merge-engines/default.md). It also supports two merge engines: `first_row` and `versioned`. The [first_row merge engine](table-design/table-types/pk-table/merge-engines/first-row.md) will keep the first row of the same primary key. The [versioned merge engine](table-design/table-types/pk-table/merge-engines/versioned.md) will keep the row with the largest version of the same primary key.                                                                                                                                                                                                                                                                                    |