working on conflict and andorid emulator path