Editing mainActivity
Merge R