Resolved merge conflicts Resolved merge conflicts
Fixed issue with visible padding row Incremental improvements Added tests Added tests for sorted insert, and fixed lint errors