diff --git a/src/cli/cli_config.h b/src/cli/cli_config.h
index edebf7feb..96148e3db 100644
--- a/src/cli/cli_config.h
+++ b/src/cli/cli_config.h
@@ -59,7 +59,6 @@
 #endif
 
 /**
-<<<<<<< HEAD
  * @def OPENTHREAD_CONFIG_CLI_TCP_ENABLE
  *
  * Indicates whether TCP should be enabled in the CLI tool.