change merge.rb