conflict resolved in problem.rb