diff --git a/src/mqtt/protocol/mqtt/mqtt_client.c b/src/mqtt/protocol/mqtt/mqtt_client.c
index 6ae6c95ed..cc4853e74 100644
--- a/src/mqtt/protocol/mqtt/mqtt_client.c
+++ b/src/mqtt/protocol/mqtt/mqtt_client.c
@@ -994,6 +994,7 @@ mqtt_ctx_send(void *arg, nni_aio *aio)
 		if (qos == 0) {
 			break;
 		}
+		// fall through
 	case NNG_MQTT_SUBSCRIBE:
 	case NNG_MQTT_UNSUBSCRIBE:
 		packet_id = mqtt_sock_get_next_packet_id(s);
diff --git a/src/mqtt/protocol/mqtt/mqtt_quic_client.c b/src/mqtt/protocol/mqtt/mqtt_quic_client.c
index 6009f8591..16254cfaa 100644
--- a/src/mqtt/protocol/mqtt/mqtt_quic_client.c
+++ b/src/mqtt/protocol/mqtt/mqtt_quic_client.c
@@ -1811,7 +1811,6 @@ mqtt_quic_ctx_send(void *arg, nni_aio *aio)
 				} else {
 					nni_id_set(s->topic_map, hash, (void *)(num_ptr + 1));
 				}
->>>>>>> e7f708c6 (* FIX [quic/proto] Add error handler when alloc a quic stream failed.)
 			} else {
 				if ((rv = mqtt_pipe_send_msg(aio, msg, pub_pipe, 0)) >= 0) {
 					nni_mtx_unlock(&s->mtx);
diff --git a/src/mqtt/protocol/mqtt/mqttv5_client.c b/src/mqtt/protocol/mqtt/mqttv5_client.c
index 70936c3a1..b9be96388 100644
--- a/src/mqtt/protocol/mqtt/mqttv5_client.c
+++ b/src/mqtt/protocol/mqtt/mqttv5_client.c
@@ -995,6 +995,7 @@ mqtt_ctx_send(void *arg, nni_aio *aio)
 		if (qos == 0) {
 			break;
 		}
+		// fall through
 	case NNG_MQTT_SUBSCRIBE:
 	case NNG_MQTT_UNSUBSCRIBE:
 		packet_id = mqtt_sock_get_next_packet_id(s);
diff --git a/src/mqtt/protocol/mqtt/mqttv5_quic_client.c b/src/mqtt/protocol/mqtt/mqttv5_quic_client.c
index 29a437e89..2c2014e70 100644
--- a/src/mqtt/protocol/mqtt/mqttv5_quic_client.c
+++ b/src/mqtt/protocol/mqtt/mqttv5_quic_client.c
@@ -205,6 +205,7 @@ mqtt_send_msg(nni_aio *aio, nni_msg *msg, mqtt_sock_t *s)
 		if (qos == 0) {
 			break; // QoS 0 need no packet id
 		}
+		// fall through
 	case NNG_MQTT_SUBSCRIBE:
 	case NNG_MQTT_UNSUBSCRIBE:
 		packet_id = nni_mqtt_msg_get_packet_id(msg);
@@ -329,6 +330,7 @@ mqtt_pipe_send_msg(nni_aio *aio, nni_msg *msg, mqtt_pipe_t *p, uint16_t packet_i
 		if (qos == 0) {
 			break; // QoS 0 need no packet id
 		}
+		// fall through
 	case NNG_MQTT_SUBSCRIBE:
 	case NNG_MQTT_UNSUBSCRIBE:
 		packet_id = nni_mqtt_msg_get_packet_id(msg);
@@ -1694,6 +1696,7 @@ mqtt_quic_ctx_send(void *arg, nni_aio *aio)
 		if (nni_mqtt_msg_get_publish_qos(msg) == 0) {
 			break;
 		}
+		// fall through
 	case NNG_MQTT_SUBSCRIBE:
 	case NNG_MQTT_UNSUBSCRIBE:
 		packet_id = mqtt_pipe_get_next_packet_id(s);