wireless: cleanup some merge errors