merged conflicts
merged conflicts
Mainactivity comment time setting for testing other views