update to merged version