diff --git a/partitioned-table.md b/partitioned-table.md
index e25a7cf6a87c6..d3214e5c61851 100644
--- a/partitioned-table.md
+++ b/partitioned-table.md
@@ -719,14 +719,7 @@ You can see that the inserted record `(NULL, 'mothra')` falls into the same part
For `LIST` and `RANGE` partitioned tables, you can add and drop partitions using the `ALTER TABLE
ADD PARTITION ()` or `ALTER TABLE DROP PARTITION ` statement.
-<<<<<<< HEAD
For `LIST` and `RANGE` partitioned tables, `REORGANIZE PARTITION` is not yet supported.
-=======
-- Add partitions using the `ALTER TABLE ADD PARTITION ()` statement.
-- Drop partitions using the `ALTER TABLE DROP PARTITION ` statement.
-- Remove all data from specified partitions using the `ALTER TABLE TRUNCATE PARTITION ` statement. The logic of `TRUNCATE PARTITION` is similar to [`TRUNCATE TABLE`](/sql-statements/sql-statement-truncate.md) but it is for partitions.
-- Merge, split, or make other changes to the partitions using the `ALTER TABLE REORGANIZE PARTITION INTO ()` statement.
->>>>>>> bad9362ff (fix range columns examples (#14040))
For `HASH` partitioned tables, `COALESCE PARTITION` and `ADD PARTITION` are not yet supported.