diff --git a/lista.txt b/lista.txt
index 3f20d9f..3666628 100644
--- a/lista.txt
+++ b/lista.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.Mrowicki Maciej
+=======
+1. Biadała Magdalena
+>>>>>>> 12e346e722bf82523ace08f2ba9a622a994d7c3e