Merge 2 versions