I must be unusually dense this week. Finished the grid, drawn the lines, worked out what the 12-letter theme is but ... don't see how to resolve the clash "so as to complete the puzzle's theme". Are the 2 words still words after the clash has been resolved? Is one of the clashing letters the right one?