another merge conflict fixed
Fixup double define. But which one is right?

As this is not really my native language I can have deleted the wrong translation