resolve conflict

Signed-off-by: kminoda <koji.minoda@tier4.jp>

localization/deviation_estimation_tools/ReadMe.md

@@ -213,7 +213,8 @@ Make sure that `c>95`. -->
 
 #### B. Check the compatibility with a threshold in `localization_error_monitor`
 
-The `deviation_evaluator` also checks the compatiblity of the estimated parameters and the threshold in `localization_error_monitor`.
+The `deviation_evaluator` also checks the compatibility of the estimated parameters and the threshold in `localization_error_monitor`.
+
 Concretely, it checks if the two following statement holds:
 
 1. `localization_error_monitor` would NOT diagnose the system as `WARN` nor `ERROR` as long as the NDT is available.

localization/deviation_estimation_tools/deviation_evaluator/config/deviation_evaluator.param.yaml

@@ -11,7 +11,7 @@
     angular_velocity_offset_z: 0.0
 
     # Dead Reckoning configuration
-    wait_duration: 6.0 # [s]
+    wait_duration: 4.0 # [s]
     wait_scale: 1.3
 
     need_ekf_initial_trigger: true