Merge branch 'secondb' into 'master'

Adds changes file conflict

Sample

See merge request !2

edit_this_file.rb

@@ -2,7 +2,7 @@ class HelloWorld
   def initialize(name)
     @name = name.capitalize
   end
-
+  # working here
   def say_hi
     puts "Hello #{@name}!"
   end