Changed file hello_Korotky.rb
Changed file hello_Korotkyi
Changed file File1.txt
after conflict resolving