Minor change in main
Merge conflict MainActivity