Fixed merge conflicts in CORRECT task-file..