Text matching: Solve simple conflicts automatically

This fixes several cases where a word was assigned to two fields (producing a conflict), although another variant was available for one of them.