Fixed MainActivity page.
merged conflicts in strings.xml