Update MainActivity.java

getting rid of stupid merge issue notifications