Trying this rolling merge needed for middleend again