fix union type. the upstream should NOT necessarily go through after merge point.