fix merge conficts with packet_out_with_packet_in branch