updating tasks lists
merge resolving