diff --git a/nfq/desync.c b/nfq/desync.c
index f9a3c11..73966ba 100644
--- a/nfq/desync.c
+++ b/nfq/desync.c
@@ -652,6 +652,8 @@ static uint8_t dpi_desync_tcp_packet_play(bool replay, size_t reasm_offset, uint
 						return verdict;
 					verdict = ct_new_postnat_fix_tcp(ctrack, ip, ip6hdr, tcphdr);
 					break;
+				default:
+					break;
 			}
 			// can do nothing else with SYN packet
 			return verdict;
@@ -956,7 +958,6 @@ static uint8_t dpi_desync_tcp_packet_play(bool replay, size_t reasm_offset, uint
 					return VERDICT_DROP;
 				}
 			default:
-				// fix code analyzer warning
 				pkt1_len=0;
 				break;
 		}
@@ -1169,6 +1170,8 @@ static uint8_t dpi_desync_tcp_packet_play(bool replay, size_t reasm_offset, uint
 
 					return VERDICT_DROP;
 				}
+			default:
+				break;
 		}
 	
 	}
@@ -1474,8 +1477,11 @@ static uint8_t dpi_desync_udp_packet_play(bool replay, size_t reasm_offset, uint
 				desync_mode = params.desync_mode2;
 				break;
 			default:
+<<<<<<< HEAD
 				// fix code analyzer warning
 				pkt1_len=0;
+=======
+>>>>>>> 44ecef0 (fix compiler warnings: -Wswitch)
 				break;
 		}
 
@@ -1578,6 +1584,8 @@ static uint8_t dpi_desync_udp_packet_play(bool replay, size_t reasm_offset, uint
 
 					return ct_new_postnat_fix_udp(ctrack, ip, ip6hdr, udphdr, len_pkt);
 				}
+			default:
+				break;
 		}
 
 	}