Fix wrong version after merge