A bit more upmerge