resolve conflicts

Signed-off-by: Aolin <[email protected]>

tidb-lightning/tidb-lightning-configuration.md

@@ -147,15 +147,14 @@ strategy = ""
 # The default value is `false`.
 # When you use parallel import mode, you must set the parameter to `true`,
 # but the premise is that no data exists in the target table, that is, all data can only be imported by TiDB Lightning.
-# Note that this parameter **is not for incremental data import** and is only used in scenarios where the target table is empty.
-# incremental-import = false
+# Note that this parameter is only used in scenarios where the target table is empty.
+# parallel-import = false
 # Action to do when trying to insert a conflicting record in the logical import mode.
 # For more information on the conflict detection, see the document: https://docs.pingcap.com/tidb/dev/tidb-lightning-logical-import-mode-usage#conflict-detection
 #  - replace: use new entry to replace the existing entry
 #  - ignore: keep the existing entry, and ignore the new entry
 #  - error: report error and quit the program
 # on-duplicate = "replace"
-
 # Whether to detect and resolve duplicate records (unique key conflict) in the physical import mode.
 # The following resolution algorithms are supported:
 #  - none: does not detect duplicate records, which has the best performance of the two algorithms.