Merge wifi_auth