commit for fix conflict
up alex
up test bluetooth alex