diff --git a/README.md b/README.md
index 4af60d5..7463ee4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
 
 Linha 1
 
+<<<<<<< HEAD
 Linha aaa
+=======
+Linha 789
+>>>>>>> 6499037d723350efe9a2c3348fda9ee7cdac1c59
 
 Linha 3