Merging upstream into downstream