diff --git a/lista.txt b/lista.txt
index 454ee88..e874b9d 100644
--- a/lista.txt
+++ b/lista.txt
@@ -1 +1,4 @@
+<<<<<<< HEAD
 1. Biadała Magdalena
+2. Hromov Serhii
+>>>>>>> 12e346e722bf82523ace08f2ba9a622a994d7c3e