@TillmannTaape : still getting a conflict. Could you take a look at around line 19 of ms-xml/tl/tlp006vpreTEI.xml
in the master branch it reads: when the large <tl>thin cane</tl> is red, they seize the hot end using
this will be changed to when the large <tl>cane</tl> is red, they seize the hot end using
Is that OK?
Yes that's correct! I'm fairly sure I saw exactly that conflict and tried to resolve it, which makes me think I must have not done it right.