created solver.rb
fix conflict