diff --git a/lista.txt b/lista.txt
index cf5e2f0..4963319 100644
--- a/lista.txt
+++ b/lista.txt
@@ -1 +1,6 @@
+<<<<<<< HEAD
 1.Łukaszewska Kamilla
+2. Spaczyński Jonathan
+=======
+2. Spaczyński Jonathan
+>>>>>>> 6a446033bc107e20e24bf3cb0ae5b6eda580b826