Merge upstream and resolve conflicts.