merge versions fix