fixed missing brackets in task.js
fixed merge conflicts