Update MainActivity.java

Testing rebase