teksts update
text update
more translation
conflict resolution