Fix spurious conflict marker in Changelog
Fix spurious conflict marker in Changelog

Fixes:

    changelog.rst:9: (SEVERE/4) Missing matching underline for section title overline.

    =======

koljonen/pgcli,dbcli/pgcli,dbcli/pgcli,koljonen/pgcli