Apply suggestions from code review

ticdc/troubleshoot-ticdc.md

@@ -397,8 +397,6 @@ If you want to skip this DDL statement that goes wrong, set the start-ts of the
 cdc cli changefeed update -c test-cf --pd=http://10.0.10.25:2379 --start-ts 415241823337054210
 cdc cli changefeed resume -c test-cf --pd=http://10.0.10.25:2379
 ```
-<<<<<<< HEAD
-=======
 
 ## The default value of the time type field is inconsistent when replicating a DDL statement to the downstream MySQL 5.7. What can I do?
 
@@ -423,20 +421,3 @@ mysql root@127.0.0.1:test> show create table test;
 From the result, you can see that the table schema before and after the replication is inconsistent. This is because the default value of `explicit_defaults_for_timestamp` in TiDB is different from that in MySQL. See [MySQL Compatibility](/mysql-compatibility.md#default-differences) for details.
 
 Since v5.0.1 or v4.0.13, for each replication to MySQL, TiCDC automatically sets `explicit_defaults_for_timestamp = ON` to ensure that the time type is consistent between the upstream and downstream. For versions earlier than v5.0.1 or v4.0.13, pay attention to the compatibility issue caused by the inconsistent `explicit_defaults_for_timestamp` value when using TiCDC to replicate the time type data.
-
-## When the sink of the replication downstream is TiDB or MySQL, what permissions do users of the downstream database need?
-
-When the sink is TiDB or MySQL, the users of the downstream database need the following permissions:
-
-- `Select`
-- `Index`
-- `Insert`
-- `Update`
-- `Delete`
-- `Create`
-- `Drop`
-- `Alter`
-- `Create View`
-
-If you need to replicate `recover table` to the downstream TiDB, the `Super` permission is required.
->>>>>>> 3c5352b03 (ticdc: add explicit_defaults_for_timestamp compatibility troubleshoot (#6115))