Update to merged version