add Task
merge code