Update MainActivity.java

change for conflict