merge with MainActivity