something new as line 1

tekst 234 - this is also changed (again), let's hope for a conflict this time

maybe it won't merge automatically....