diff --git a/lista.txt b/lista.txt
index 452b92e..c3c8120 100644
--- a/lista.txt
+++ b/lista.txt
@@ -3,4 +3,15 @@ Lista obecnosci
 28.10.2021
 
 Lp., Imię, Nazwisko, Nr indeksu
-1. Aleksandra Adamczak, 464973
+<<<<<<< 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
+>>>>>>> 29e24e534455527994181e3b2d28c6f2c487a50e
+5. Aleksandra Adamczak, 464973