diff --git a/MyFirstFileMaked.md b/MyFirstFileMaked.md
new file mode 100644
index 0000000000000000000000000000000000000000..ab7d0082fda31e75d43fb56e8836b88e94509fd6
--- /dev/null
+++ b/MyFirstFileMaked.md
@@ -0,0 +1,3 @@
+# The First File Maked
+
+## This is the content of file.
diff --git a/README.md b/README.md
index 9335f33f3cbbcacf3cfe2813a7614af7b2622de5..1c7b44d832d5585bd88bcbb93638871b6e5c382e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,14 @@
 # ejercicios-clase-00-datos
 
+**This is the homework 1 of class 4**: Edit the readme.md file.
+
 Ejercicio paras la clase 4 de interacción con los repos
 
+<<<<<<< HEAD
 
 ### Mijael repo
 
-## This change is maked form clone!
\ No newline at end of file
+## This change is maked form clone!
+=======
+### Mijael's repo
+>>>>>>> 67acec69b2b1ed04f6351fe5bcfc7bc2ecf337b2