some merge sort stuff commented out
resolved merge but new bits of mine still commented