fix merge

Author: blinkov

ydb/docs/en/core/reference/ydb-cli/_includes/workload/init_options_tpc.md

@@ -7,11 +7,7 @@
 | `--external-s3-endpoint <value>` or `-e <value>` | Relevant only for external tables. Link to the S3 bucket with data.                                                                                                                                                                                                                      |                      |
 | `--string`                          | Use the `String` type for text fields.                                                                                                                                                                                                                                                       | `Utf8`               |
 | `--datetime`                        | Use for time-related fields of type `Date`, `Datetime`, and `Timestamp`.                                                                                                                                                                                                                     | `Date32`, `Datetime64`, `Timestamp64` |
-<<<<<<< HEAD
-| `--float-mode <value>`              | Specifies the data type to use for fractional fields. Possible values are `float`, `decimal`, and `decimal_ydb`. `float` uses the `Float` type, `decimal` uses `Decimal` with dimensions specified by the test standard, and `decimal_ydb` uses `Decimal(22,9)` — the only type currently supported by {{ ydb-short-name }}. | `float`              |
-=======
 |  `--partition-size` | Maximum partition size in megabytes (AUTO_PARTITIONING_PARTITION_SIZE_MB) for row tables. | 2000 |
 | `--float-mode <value>`              | Specifies the data type to use for fractional fields. Possible values are `float`, `decimal`, and `decimal_ydb`. `float` uses the `Float` type, `decimal` uses `Decimal` with dimensions specified by the test standard, and `decimal_ydb` uses `Decimal(22,9)`. | `float`              |
 | `--scale` | Sets the percentage of the benchmark's data size and workload to use, relative to full scale. | 1 |
->>>>>>> bffc067fe7b (Docs: Parameterized decimal (#19482))
 | `--clear`                           | If the table at the specified path already exists, it will be deleted.                                                                                                                                                                                                                       |                      |