I take that to be a merge as-is.