manage worker onerror messages
cleanup after merge