modified plik_2 to make a branch conflict