fix version after merge