Please check again this changeset. I'm trying to do the waterways mapping right to model the real world, and it seems that you joined two different basins... the begining of waterways that flows to different basins shouln't be connected.