diff --git a/index.php b/index.php
index 484dfbc..c7a3aaf 100644
--- a/index.php
+++ b/index.php
@@ -1 +1,18 @@
-<?php echo "lucasmatheus";?>
\ No newline at end of file
+<<<<<<< HEAD
+<?php echo "lucasmatheus";?>
+=======
+<?php echo "Marcos Assunção";?>
+<br> 1 
+<br> 2
+<br> 3
+<br> 4
+<br> 5
+<br> 6
+<br> 7
+<br> 8
+<br> 9
+<br> 10
+<br> 11
+<br> 12
+<br> 13
+>>>>>>> develop