mlme.c: fixup some merge damage