it is pretty now...
merge sort of solved..
more conflicts... AARHG