Resolve a conflict (#9577)

Author: michaelklishin

deps/rabbitmq_stream/src/rabbit_stream_reader.erl

@@ -84,13 +84,8 @@
          heartbeat :: undefined | integer(),
          heartbeater :: any(),
          client_properties = #{} :: #{binary() => binary()},
-<<<<<<< HEAD
-         monitors = #{} :: #{reference() => stream()},
-         stats_timer :: undefined | reference(),
-=======
          monitors = #{} :: #{reference() => {pid(), stream()}},
-         stats_timer :: undefined | rabbit_event:state(),
->>>>>>> d1f597aae2 (Fix a couple for dialyzer warnings)
+         stats_timer :: undefined | reference(),
          resource_alarm :: boolean(),
          send_file_oct ::
              atomics:atomics_ref(), % number of bytes sent with send_file (for metrics)

deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl

@@ -104,26 +104,6 @@ init_per_group(Group, Config)
                                       ++ ExtraSetupSteps
                                       ++ rabbit_ct_broker_helpers:setup_steps());
 init_per_group(cluster = Group, Config) ->
-<<<<<<< HEAD
-    Config1 =
-        rabbit_ct_helpers:set_config(Config, [{rmq_nodes_clustered, true}]),
-    Config2 =
-        rabbit_ct_helpers:set_config(Config1,
-                                     [{rmq_nodes_count, 3},
-                                      {rmq_nodename_suffix, Group},
-                                      {tcp_ports_base}]),
-    Config3 =
-        rabbit_ct_helpers:set_config(Config2,
-                                     {rabbitmq_ct_tls_verify, verify_none}),
-    rabbit_ct_helpers:run_setup_steps(Config3,
-                                      [fun(StepConfig) ->
-                                          rabbit_ct_helpers:merge_app_env(StepConfig,
-                                                                          {aten,
-                                                                           [{poll_interval,
-                                                                             1000}]})
-                                       end]
-                                      ++ rabbit_ct_broker_helpers:setup_steps());
-=======
     Config1 = rabbit_ct_helpers:set_config(
                 Config, [{rmq_nodes_clustered, true},
                          {rmq_nodes_count, 3},
@@ -141,7 +121,6 @@ init_per_group(cluster = Group, Config) ->
                                                   1000}]})
        end]
       ++ rabbit_ct_broker_helpers:setup_steps());
->>>>>>> 3273003ef2 (Monitor members to the same stream in stream connection)
 init_per_group(_, Config) ->
     rabbit_ct_helpers:run_setup_steps(Config).