adjusting tasks page
merging and resolving conflicts