Fixing merge issues readd wifi