updating tasks to done
merging