Update RowScanner.java
Update ScannerTreesMerger.java
Update RowScannerTest.java
Update ScannerTreesMergerTest.java