fix conflict namme for android