Added addWorker function
Fixed conflicts