update mobile version
fix conflicts