Fixed the activity_main.xml

Fixed the conflict