android version
fixing conflict
first batch