type when mergeing with upstream