task index
task index and changes to schema
merge conflict resolved