fixed add task
fixed merge conflict