Feature conflcit added

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

files/ruby/feature.rb

+# This file was changed in feature branch
+# We put different code here to make merge conflict
+class Conflict
+end