Upmerge part 2