Improved handling of competing blocks of text in the
IslandConflictResolver.