merge two versions into one