Added completed task section
Fixed merges