api sort for task
sorting tasks
fixed merge conflicts