diff --git a/README.md b/README.md
index ec1a05a..dd2f1fd 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,15 @@
 # README.md
-
+<<<<<<< HEAD
+-Leandro Ortiz ♦♣
+-Leandro Ortiz
+>>>>>>> test-lortiz
 - HOLA MUNDO
-- cambio desde feature
+
 
 - algo mas desde feature commit 2
 - cambio desde master
 - CAmbios de refactor
 - cambio desde github
 
-# Practica para git rebase 
+# Participantes:
+- 
diff --git a/files/.gitkeep b/files/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/hola.txt b/hola.txt
new file mode 100644
index 0000000..a111ef1
--- /dev/null
+++ b/hola.txt
@@ -0,0 +1 @@
+Hola que tal