new version after merge