merge back downstream from upstream