fix version merge bug