diff --git a/lib/a_division_by_zero_error.rb b/lib/a_division_by_zero_error.rb
index fa27ef36..c03e5f50 100644
--- a/lib/a_division_by_zero_error.rb
+++ b/lib/a_division_by_zero_error.rb
@@ -1,3 +1,4 @@
 42 / 6
 
 42 / 0
+42 / 0
diff --git a/lib/a_name_error.rb b/lib/a_name_error.rb
index bad266d9..a40ee534 100644
--- a/lib/a_name_error.rb
+++ b/lib/a_name_error.rb
@@ -1,3 +1,4 @@
 "hello world"
 
 hello_world
+"hello world"
diff --git a/lib/a_syntax_error.rb b/lib/a_syntax_error.rb
index 5252c8f7..aaddfd5e 100644
--- a/lib/a_syntax_error.rb
+++ b/lib/a_syntax_error.rb
@@ -1,3 +1,3 @@
 x = 1
 
-x = 
+x =
diff --git a/lib/a_type_error.rb b/lib/a_type_error.rb
index 1217fd52..65c22fa0 100644
--- a/lib/a_type_error.rb
+++ b/lib/a_type_error.rb
@@ -1,3 +1,7 @@
 1 + 1
 
-1 + "is the loneliest number"
+1 + 1
+<<<<<<< HEAD
+= 2
+=======
+>>>>>>> cb8b86a473ad5c53b8cd4d443e0440a05d907147