diff --git a/pkg/tink/tink.go b/pkg/tink/tink.go
index 9bb082a..5b2e771 100644
--- a/pkg/tink/tink.go
+++ b/pkg/tink/tink.go
@@ -246,7 +246,11 @@ set base {{ .ISOURL}}/{{ .Version }}
 set arch {{ .Arch }}
 dhcp
 iflinkwait -t 5000
+<<<<<<< HEAD
 kernel ${base}/harvester-${version}-vmlinuz-${arch} initrd=harvester-${version}-initrd-${arch} {{if gt .VlanID 1}}ip={{ .IP }}::{{ .Gateway }}:{{ .Netmask }}::vlan{{ .VlanID }}:off{{else}}ip={{ .IP }}::{{ .Gateway }}:{{ .Netmask }}::netboot:off{{end}} net.ifnames=1 rd.cos.disable rd.noverifyssl BOOTIF={{ .MacAddress }} ifname=netboot:{{ .MacAddress }} root=live:${base}/harvester-${version}-rootfs-${arch}.squashfs console=tty1 harvester.install.automatic=true boot_cmd='echo include_ping_test=yes >> /etc/conf.d/net-online' harvester.install.config_url={{ .HegelEndpoint }} {{if gt .VlanID 1}}vlan=vlan{{ .VlanID }}:netboot {{end}}
+=======
+kernel ${base}/harvester-${version}-vmlinuz-${arch} initrd=harvester-${version}-initrd-${arch} ip={{ .IP }}::{{ .Gateway }}:{{ .Netmask }}::netboot:off net.ifnames=1 rd.cos.disable rd.noverifyssl BOOTIF={{ .MacAddress }} ifname=netboot:{{ .MacAddress }} root=live:${base}/harvester-${version}-rootfs-${arch}.squashfs console=tty1 harvester.install.automatic=true boot_cmd='echo include_ping_test=yes >> /etc/conf.d/net-online' harvester.install.config_url={{ .HegelEndpoint }} {{if gt .VlanID 1}}vlan=vlan{{ .VlanID }}:netboot {{end}}
+>>>>>>> a4b0884 (change ipxe script to generate static address to work around dracut / networkmanager issues when network may have multiple dhcp servers)
 initrd ${base}/harvester-${version}-initrd-${arch}
 boot
 `