tasks manipulation and task states finished
solving merge conflict for tasks manipulation
fixing merge conflict