refactored tasks
refactored tasks
fixed issue with merge conflict