something new as line 1
tekst 234 - this is also changed
maybe it won't merge automatically....