merge task and subtask
add entertainment class
add override