WirelessLan/plugin.py: fix merge conflict