river pulls conditions
Resolve conflicts
Refactor river controller
ng-if in river template
Toggle info on catches