fix conflict

Signed-off-by: nolouch <nolouch@gmail.com>

Author: nolouch

conf/config.toml

@@ -199,15 +199,4 @@
 # internal-proxy = false
 
 ## When enabled, usage data will be sent to PingCAP for improving user experience.
-<<<<<<< HEAD
-# enable-telemetry = true
-=======
 # enable-telemetry = false
-
-[keyspaces]
-## pre-alloc is used to pre-allocate keyspaces during pd bootstrap.
-## Its value should be a list of strings, denotting the name of the keyspaces.
-## Example:
-## pre-alloc = ["admin", "user1", "user2"]
-# pre-alloc = []
->>>>>>> 1bc8e2a5b (dashboard: default close telemetry (#5974))