fix merge conflict

CHANGELOG.md

assets/jest.config.js

assets/package-lock.json

assets/package.json

assets/rollup.config.js

assets/src/scripts/d3-rendering/info-tooltip.js

...-location/components/hydrograph/data-loading-indicator.js

...tion/components/hydrograph/data-loading-indicator.test.js

...itoring-location/components/hydrograph/data-table.test.js

...onitoring-location/components/hydrograph/date-controls.js

...ring-location/components/hydrograph/date-controls.test.js

...nitoring-location/components/hydrograph/graph-controls.js

...ing-location/components/hydrograph/graph-controls.test.js

...cripts/monitoring-location/components/hydrograph/index.js

...s/monitoring-location/components/hydrograph/index.test.js

...onitoring-location/components/hydrograph/method-picker.js

...s/monitoring-location/components/hydrograph/parameters.js

...itoring-location/components/hydrograph/parameters.test.js

.../src/scripts/monitoring-location/store/hydrograph-data.js

...scripts/monitoring-location/store/hydrograph-data.test.js