fix conjunctsToCNF to handle prop names that are a substring of other prop names