Resolve a conflict #12671 #12672 #12676

Author: michaelklishin

deps/rabbitmq_management/test/clustering_prop_SUITE.erl

@@ -34,6 +34,8 @@ groups() ->
                               ]}
     ].
 
+-define(COLLECT_INTERVAL, 500).
+
 %% -------------------------------------------------------------------
 %% Testsuite setup/teardown.
 %% -------------------------------------------------------------------
@@ -42,13 +44,9 @@ merge_app_env(Config) ->
     Config1 = rabbit_ct_helpers:merge_app_env(Config,
                                     {rabbit, [
                                               {collect_statistics, fine},
-<<<<<<< HEAD
-                                              {collect_statistics_interval, 500}
-=======
                                               {collect_statistics_interval,
                                                ?COLLECT_INTERVAL},
                                               {core_metrics_gc_interval, 1000}
->>>>>>> 4d194b7411 (Tests: clustering_prop_SUITE set core_metrics_gc_interval to a very low value)
                                              ]}),
     rabbit_ct_helpers:merge_app_env(Config1,
                                     {rabbitmq_management, [