Fixed bug with wifitap.
Fixing merge conflicts