merge to new version