Added automatic upstream merger