fixing merge conflict with worker_application