diff --git a/app.rb b/app.rb
index c4f59af..e63f011 100644
--- a/app.rb
+++ b/app.rb
@@ -1,2 +1,5 @@
 require_relative './lib/logic.rb'
+<<<<<<< HEAD
 require_relative './lib/feature.rb'
+=======
+>>>>>>> master
diff --git a/spec/logic.rb b/spec/logic.rb
new file mode 100644
index 0000000..e69de29
diff --git a/text.txt b/text.txt
new file mode 100644
index 0000000..8bdd8af
--- /dev/null
+++ b/text.txt
@@ -0,0 +1 @@
+Rocio
diff --git a/text2.txt b/text2.txt
new file mode 100644
index 0000000..e69de29