diff --git a/test.txt b/test.txt
index 2b848df..138d9e7 100644
--- a/test.txt
+++ b/test.txt
@@ -1,4 +1,5 @@
 10
+<<<<<<< HEAD
 20
 30
 40
@@ -7,4 +8,14 @@
 77
 88
 90
+=======
+21
+31
+41
+51
+61
+71
+81
+91
+>>>>>>> master
 00