fixing incorrect merge of activity_main.xml