Adding quicksort
Fixing conflict