Resolve task

Resolve task