upstream merges