Merging upstream shenanigans