merge fix mainactivity