Merge conflicts with tasks solved.