new merged version