Merging two versions