Merged upstream repository