Fix merge non-conflict error (#5300)
Fix merge non-conflict error (#5300)


hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol,hbeatty/incubator-trafficcontrol