Update Activity.java

removed conflict