fix merge confict for change log

CHANGELOG.md

...s/monitoring-location/components/hydrograph/data-table.js

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

...ing-location/components/hydrograph/download-links.test.js

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

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

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

...location/components/hydrograph/selectors/discrete-data.js

...ion/components/hydrograph/selectors/discrete-data.test.js

wdfn-server/config.py

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

wdfn-server/waterdata/templates/monitoring_location.html

wdfn-server/waterdata/templates/questions_comments.html

wdfn-server/waterdata/views.py