fixed merge conflict in mergesort.rb