Merge "Remove all instances of the word "iff""