Fixed some comments
Fixed conflict in pq_iostat.rb