Fix ungrammar generated code when two fields have the same type

Merged Ana Gelez requested to merge ungrammar-same-type-fix into main

Merge request reports