Merge upstream branch