resolve merge noise in favor of new upstream. note that this tosses out the