add Worker finished
Merge conflict fixed