diff --git a/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c b/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c
index 0000000000..cdb7e21a8c 100644
--- a/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c
+++ b/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c
@@ -1116,11 +1116,8 @@
 			mac_capab_cso_t *d = data;
 			d->cso_flags = HCKSUM_INET_FULL_V4 | HCKSUM_IPHDRCKSUM |
 			    HCKSUM_INET_FULL_V6;
-<<<<<<< Conflict 1 of 2
-+++++++ Contents of side #1
 
-			if (CHELSIO_CHIP_VERSION(pi->adapter->params.chip) >=
-			    CHELSIO_T5) {
+			if (t4_cver_ge(pi->adapter, CHELSIO_T5)) {
 				d->cso_flags |= HCKSUM_TUN;
 				d->cso_tunnel.ct_flags =
 				    MAC_CSO_TUN_INNER_IPHDR |
@@ -1132,10 +1129,6 @@
 				    MAC_CAPAB_TUN_TYPE_VXLAN;
 			}
 		} else {
-%%%%%%% Changes from base to side #2
--		} else
-+		} else {
->>>>>>> Conflict 1 of 2 ends
 			status = B_FALSE;
 		}
 		break;
@@ -1150,11 +1143,8 @@
 			    LSO_TX_BASIC_TCP_IPV6;
 			d->lso_basic_tcp_ipv4.lso_max = 65535;
 			d->lso_basic_tcp_ipv6.lso_max = 65535;
-<<<<<<< Conflict 2 of 2
-+++++++ Contents of side #1
 
-			if (CHELSIO_CHIP_VERSION(pi->adapter->params.chip) >=
-			    CHELSIO_T5) {
+			if (t4_cver_ge(pi->adapter, CHELSIO_T5)) {
 				d->lso_flags |= LSO_TX_TUNNEL_TCP;
 				d->lso_tunnel_tcp.tun_pay_max = 65535;
 				d->lso_tunnel_tcp.tun_encap_max = ENCAP_MAX;
@@ -1164,10 +1154,6 @@
 				d->lso_tunnel_tcp.tun_flags = 0;
 			}
 		} else {
-%%%%%%% Changes from base to side #2
--		} else
-+		} else {
->>>>>>> Conflict 2 of 2 ends
 			status = B_FALSE;
 		}
 		break;
diff --git a/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c b/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c
index 0000000000..f8285b3adf 100644
--- a/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c
+++ b/usr/src/uts/common/io/cxgbe/t4nex/t4_sge.c
@@ -1100,7 +1100,7 @@
 	sizeof (struct cpl_tx_pkt_core)) / FLIT_NUM_BYTES)
 
 /* Header of a tunneled tx LSO WR, before SGL of first packet (in flits) */
-#define	TXPKT_TNL_LSO_WR_HDR ((\
+#define	TXPKT_TNL_LSO_WR_HDR_FLITS ((\
 	sizeof (struct fw_eth_tx_pkt_wr) + \
 	sizeof (struct cpl_tx_tnl_lso) + \
 	sizeof (struct cpl_tx_pkt_core)) / 8)
@@ -3112,18 +3112,11 @@
 	 * Do we have enough flits to send this frame out?
 	 */
 	ctrl = sizeof (struct cpl_tx_pkt_core);
-<<<<<<< Conflict 1 of 2
-+++++++ Contents of side #1
 	if (do_tso && is_tunneled) {
-		nflits = TXPKT_TNL_LSO_WR_HDR;
+		nflits = TXPKT_TNL_LSO_WR_HDR_FLITS;
 		ctrl += sizeof (struct cpl_tx_tnl_lso);
 	} else if (do_tso) {
-		nflits = TXPKT_LSO_WR_HDR;
-%%%%%%% Changes from base to side #2
- 	if (txinfo->flags & HW_LSO) {
--		nflits = TXPKT_LSO_WR_HDR;
-+		nflits = TXPKT_LSO_WR_HDR_FLITS;
->>>>>>> Conflict 1 of 2 ends
+		nflits = TXPKT_LSO_WR_HDR_FLITS;
 		ctrl += sizeof (struct cpl_tx_pkt_lso_core);
 	} else {
 		nflits = TXPKT_WR_HDR_FLITS;
@@ -3135,18 +3128,11 @@
 		nflits += howmany(txinfo->len, FLIT_NUM_BYTES);
 		ctrl += txinfo->len;
 	}
-<<<<<<< Conflict 2 of 2
-%%%%%%% Changes from base to side #1
-+
- 	ndesc = howmany(nflits, 8);
- 	if (ndesc > eq->avail)
-+++++++ Contents of side #2
 
 	ASSERT3U(nflits, >, 0);
 
 	const uint16_t ncredits = EQ_FLITS_TO_HC(nflits);
 	if (ncredits > eq->tse_avail)
->>>>>>> Conflict 2 of 2 ends
 		return (ENOMEM);
 
 	/* For tunneled TSO, check protos and fixup outer IPv4 cksum */