fix changelog merge mistake
fix changelog merge mistake

nicoddemus/pytest,rmfitzpatrick/pytest,MichaelAquilina/pytest,markshao/pytest,tomviner/pytest,pfctdayelise/pytest,The-Compiler/pytest,flub/pytest,The-Compiler/pytest,tomviner/pytest,pytest-dev/pytest,alfredodeza/pytest,RonnyPfannschmidt/pytest,davidszotten/pytest,nicoddemus/pytest,ddboline/pytest,hackebrot/pytest,Akasurde/pytest,txomon/pytest,tareqalayan/pytest