diff --git a/lista.txt b/lista.txt
index 4963319..386f60d 100644
--- a/lista.txt
+++ b/lista.txt
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
 1.Łukaszewska Kamilla
 2. Spaczyński Jonathan
-=======
-2. Spaczyński Jonathan
->>>>>>> 6a446033bc107e20e24bf3cb0ae5b6eda580b826
+3. Maciej Zaremba
\ No newline at end of file