Update merged version