sort inbetween
Resolve the merge conflict.. yeay