Shasta County settled the dispute