Merge changes from upstream repository