fix merging for versions different from default