removed files leftover from merge conflict
changed groups to task lists