Unfinished stuff for setting the tasks as done in flat view
Fixed merge
Create new task implemented
FixedMerge