Resolve a conflict #12703 #12702

Author: michaelklishin

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -202,16 +202,7 @@ all_tests() -> [
     qq_status_test,
     list_deprecated_features_test,
     list_used_deprecated_features_test,
-<<<<<<< HEAD
-    cluster_tags_test
-=======
-    connections_amqpl,
-    connections_amqp,
-    amqp_sessions,
-    amqpl_sessions,
-    enable_plugin_amqp,
     cluster_and_node_tags_test
->>>>>>> 3d35416635 (Node tags local to broker, add to /api/overview output and ctl status command)
 ].
 
 %% -------------------------------------------------------------------