double from merging upstream