merge fix MainActivity