Merge with other version