diff --git a/lista.txt b/lista.txt
index 2997c70..4032cf6 100644
--- a/lista.txt
+++ b/lista.txt
@@ -3,6 +3,15 @@ Lista obecnosci
 28.10.2021
 
 Lp., Imię, Nazwisko, Nr indeksu
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+1, Jeremi, Lisek, 464943
+>>>>>>> fecaec7c96318e0f0ddd9cac3995646d588bd18a
+=======
 1, Jeremi, Lisek, 464943
 2, Michał, Kamiński, 464945
 3, Gabriela, Piekarska, 464876
+>>>>>>> f9f23f5532246ca2aaeb103fa70e0eaf5f863243
+4., Jakub, Prus, 464970
+>>>>>>> b28e3175e70de7f3606b009689aae9b6ad776f6a