Fix merge conflict in changelog

Please enter the commit message for your changes. Lines starting
Merge branch 'jeroendesloovere-bugfix-pages-previous-next'