I moved this change in the unstable stream even if there were two conflicts, but it seems to me that the code was equivalent. Could you check the two following methods:
Checking extendableText6-kfr.cs (#5963) for method conflicts with changesets after The Worlds of Squeak ... ...checking TextMorph>>getFirstCharacter CONFLICT found for TextMorph class>>getFirstCharacter with newer changesets 6012-1016nonASCIIs 6056-40236firstLastChar
I don't know the algorithm of the conflict checker, but these are equivalent but in different encoding. In the other words, they are under control.
-- Yoshiki