River chart in working condition
Conflict resolved