This is an automated cherry-pick of pingcap#6218

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

tikv-configuration-file.md

@@ -397,13 +397,13 @@ Configuration items related to Raftstore
 
 ### `hibernate-regions` (**Experimental**)
 
+<<<<<<< HEAD
 + Enables or disables Hibernate Region. When this option is enabled, a Region idle for a long time is automatically set as hibernated. This reduces the extra overhead caused by heartbeat messages between the Raft leader and the followers for idle Regions. You can use `raftstore.peer-stale-state-check-interval` to modify the heartbeat interval between the leader and the followers of hibernated Regions.
 + Default value: false
-
-### `raftstore.peer-stale-state-check-interval`
-
-+ Modifies the state check interval for Regions.
-+ Default value: 5 min
+=======
++ Enables or disables Hibernate Region. When this option is enabled, a Region idle for a long time is automatically set as hibernated. This reduces the extra overhead caused by heartbeat messages between the Raft leader and the followers for idle Regions. You can use `peer-stale-state-check-interval` to modify the heartbeat interval between the leader and the followers of hibernated Regions.
++ Default value: `true` in v5.0.2 and later versions; `false` in versions before v5.0.2
+>>>>>>> 229a0705c (TiKV configuration: remove redundant instructions (#6218))
 
 ### `split-region-check-tick-interval`