Merging changes from upstream repository