diff --git a/lista.txt b/lista.txt
index 454ee88..d424bfb 100644
--- a/lista.txt
+++ b/lista.txt
@@ -1 +1,5 @@
-1. Biadała Magdalena
+<<<<<<< HEAD
+1. Biesiada Patryk
+=======
+1. Biadala Magdalena
+>>>>>>> 12e346e722bf82523ace08f2ba9a622a994d7c3e