fix wifi toast merge