fix changelog conflict

CHANGELOG.md

Makefile

assets/package-lock.json

...ation/components/daily-value-hydrograph/graph-controls.js

.../components/daily-value-hydrograph/graph-controls.test.js

...oring-location/components/daily-value-hydrograph/index.js

...-location/components/daily-value-hydrograph/index.test.js

...ng-location/selectors/daily-value-time-series-selector.js

...cation/selectors/daily-value-time-series-selector.test.js

assets/src/styles/components/_dv-hydrograph.scss

wdfn-server/waterdata/templates/macros/components.html

wdfn-server/waterdata/templates/monitoring_location.html