stuffs
merge conflict resolution (mainactivity.java)