fix conflicts (which I thought I had fixed...)

src/biotree/Data.java

src/sandbox/Point.java

src/sort/Bound.java

src/sort/GeneralCompare.java

src/sort/KDT.java

src/sort/MergeSort.java