openvswitch: Fix bad merge resolution.