merging with an upstream