resolving conflicts in AndroidTestingApp MainActivity.java