upstream merging