Merge two versions into same file