merge code from version manager