removed conflict testing from MyActivity.java