added disable emulator modal
fix conflict