iwlwifi: mvm: fix merge damage