parallel sort of working
merge conflicts