Fixed and added a message for aborting a task
Merged and resolved conflicts