merge upstream w/ conflicts