merge
merge and fix wifi