fix a bug in hbaseRecordReader; do not use filter now
fix conflict