Edited mainactivty before merge.