Update MainActivity.java

add to conflict