Fixed bugs in GermData: merge-of-confinality-classes was not done properly