diff --git a/app.rb b/app.rb
index c4f59af..67024d3 100644
--- a/app.rb
+++ b/app.rb
@@ -1,2 +1,2 @@
 require_relative './lib/logic.rb'
-require_relative './lib/feature.rb'
+require_relative './lib/feature.rb'
\ No newline at end of file
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..1949a03
--- /dev/null
+++ b/text.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+This is test part 2. Committed through the branch. 
+=======
+test
+>>>>>>> master