Resolve conflicts #16253 #16297 #16298

Author: michaelklishin

deps/rabbit/Makefile

@@ -272,11 +272,7 @@ PARALLEL_CT_SET_4_B = per_user_connection_tracking per_vhost_connection_limit ra
 PARALLEL_CT_SET_4_C = msg_size_metrics unit_msg_size_metrics per_vhost_msg_store per_vhost_queue_limit priority_queue upgrade_preparation vhost
 PARALLEL_CT_SET_4_D = per_user_connection_channel_tracking product_info queue_type rabbitmq_queues_cli_integration rabbitmq_streams_cli_integration rabbitmqctl_integration rabbitmqctl_shutdown routing rabbit_amqqueue
 
-<<<<<<< HEAD
-PARALLEL_CT_SET_5_A = consumer_recheck_prop rabbit_direct_reply_to_prop prop_stream_arg_validation direct_reply_to_amqpl direct_reply_to_amqp classic_queue
-=======
-PARALLEL_CT_SET_5_A = consumer_recheck_prop pid_codec pid_codec_prop rabbit_direct_reply_to_prop rabbit_quorum_queue_prop prop_stream_arg_validation direct_reply_to_amqpl direct_reply_to_amqp classic_queue
->>>>>>> 6a16321935 (Add new test suites to the parallel CT set 5A)
+PARALLEL_CT_SET_5_A = consumer_recheck_prop pid_codec pid_codec_prop rabbit_direct_reply_to_prop prop_stream_arg_validation direct_reply_to_amqpl direct_reply_to_amqp classic_queue
 PARALLEL_CT_SET_5_B = feature_flags_v2 backing_queue transactions
 PARALLEL_CT_SET_5_C = metadata_store_migration cluster_upgrade maintenance_mode
 PARALLEL_CT_SET_5_D = rabbit_fifo_dlx_integration publisher_confirms_parallel

deps/rabbit/src/rabbit_volatile_queue.erl

@@ -418,7 +418,6 @@ pid_from_name(<<?PREFIX, Bin/binary>>, CandidateNodes) ->
 pid_from_name(_, _) ->
     error.
 
-<<<<<<< HEAD
 %% Returns the base 64 encoded key.
 -spec key_from_name(rabbit_misc:resource_name()) ->
     {ok, binary()} | error.
@@ -431,14 +430,13 @@ key_from_name(<<?PREFIX, Suffix/binary>>) ->
     end;
 key_from_name(_) ->
     error.
-=======
+
 %% Returns the integer hash following "@" in a synthetic node-name binary
 %% such as <<"reply@1234567">>. Malformed input raises and is caught by
 %% the surrounding try.
 node_hash_from_binary(NodeBin) ->
     [_Prefix, Suffix] = binary:split(NodeBin, <<"@">>),
     binary_to_integer(Suffix).
->>>>>>> fa3a26d20b (Refactor Direct Reply-to one more time)
 
 nodes_with_hashes() ->
     #{erlang:phash2(Node) => Node || Node <- rabbit_nodes:list_members()}.