merging upstream changes