android studio
resolve conflit