diff --git a/pkg/errs/errno.go b/pkg/errs/errno.go
index 2a52a3bb667..c478a04cdf5 100644
--- a/pkg/errs/errno.go
+++ b/pkg/errs/errno.go
@@ -112,7 +112,6 @@ var (
 	ErrCancelStartEtcd       = errors.Normalize("etcd start canceled", errors.RFCCodeText("PD:server:ErrCancelStartEtcd"))
 )
 
-<<<<<<< HEAD
 // logutil errors
 var (
 	ErrInitFileLog = errors.Normalize("init file log error, %s", errors.RFCCodeText("PD:logutil:ErrInitFileLog"))
@@ -123,8 +122,6 @@ var (
 	ErrBytesToUint64 = errors.Normalize("invalid data, must 8 bytes, but %d", errors.RFCCodeText("PD:typeutil:ErrBytesToUint64"))
 )
 
-=======
->>>>>>> 12a08b1... server: Refine log error format (#2873)
 // The third-party project error.
 // url errors
 var (
@@ -238,7 +235,6 @@ var (
 
 // leveldb errors
 var (
-<<<<<<< HEAD
 	ErrLevelDBClose = errors.Normalize("close leveldb error", errors.RFCCodeText("PD:leveldb:ErrLevelDBClose"))
 	ErrLevelDBWrite = errors.Normalize("leveldb write error", errors.RFCCodeText("PD:leveldb:ErrLevelDBWrite"))
 	ErrLevelDBOpen  = errors.Normalize("leveldb open file error", errors.RFCCodeText("PD:leveldb:ErrLevelDBOpen"))
@@ -252,8 +248,4 @@ var (
 // log
 var (
 	ErrInitLogger = errors.Normalize("init logger error", errors.RFCCodeText("PD:log:ErrInitLogger"))
-=======
-	ErrLevelDBClose = errors.Normalize("failed to close leveldb", errors.RFCCodeText("PD:leveldb:ErrLevelDBClose"))
-	ErrLevelDBWrite = errors.Normalize("failed to write leveldb", errors.RFCCodeText("PD:leveldb:ErrLevelDBWrite"))
->>>>>>> 12a08b1... server: Refine log error format (#2873)
 )