Conflict Resolved in iozone.rb
Resolve error commiting trr