update android manifest
fix conflict