Mergin' upstream