Merge upstream with conflicts