add timeout
merge rivers based on gnis_id or else HUC8
better info on bug