I hope to look at this conflict tomorrow.

We are getting conflicts sometimes when the line looks like this:

The translator has provided a translation which updates the translation with a value, and removes the unfinished attribute. A conflict occurs if that same line has other modifications at the same time. But I can't see any.
I'll merge this, and again look more closely next time there is an error to see what else might be writing to the that source file.