MainActivity changes
Merge