remove merge conflict

Author: Matveev Sergei

ydb/core/protos/config.proto

@@ -2181,19 +2181,7 @@ message TColumnShardConfig {
     optional uint64 BadPortionSizeLimit = 51 [default = 524288];
     optional uint64 BadPortionsLimit = 52;
     optional bool CombineChunksInResult = 54 [default = true];
-<<<<<<< HEAD
-=======
-    optional bool EnableDiagnostics = 55 [default = true];
-    optional bool EnableParallelCompaction = 56 [default = true];
-
-    message TStatistics {
-        optional uint32 ReportBaseStatisticsPeriodMs = 1 [default = 60000];
-        optional uint32 ReportExecutorStatisticsPeriodMs = 2 [default = 60000];
-    }
-
-    optional TStatistics Statistics = 57;
     optional NKikimrSchemeOp.TS3Settings S3Client = 58;
->>>>>>> 0430af77564 (add S3 client knobs + split in‑flight limits (#29541))
 }
 
 message TSchemeShardConfig {