changes
main activity changes
merging