Merge to new version