When migrating keyword occurrences to a tag that keyword that already exists, don't add the new keyword to the option list, but do remove the old one.