Merge upstream repository changes