Update RowScanner.java, ScannerTreesMerger.java
Update ScannerTreesMergerTest.java