wifi
fixed conflicts