tuning up task index page
modified task list
fixed conflict