added few line to make a conflict
merged plik_2