diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index eec77af..bcbc402 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -1523,7 +1523,6 @@ instance
 will enable dnsmasq to also provide proxy PXE service to those PXE clients with
 .I HW-Client
 in as their identifier.
->>>>>>> 907def3... pxe: support pxe clients with custom vendor-class
 .TP  
 .B \-X, --dhcp-lease-max=<number>
 Limits dnsmasq to the specified maximum number of DHCP leases. The