DOCS: fix rebase issue with changelog
DOCS: fix rebase issue with changelog

lpsinger/astropy,stargaser/astropy,bsipocz/astropy,lpsinger/astropy,funbaker/astropy,StuartLittlefair/astropy,StuartLittlefair/astropy,saimn/astropy,MSeifert04/astropy,DougBurke/astropy,lpsinger/astropy,funbaker/astropy,pllim/astropy,lpsinger/astropy,DougBurke/astropy,saimn/astropy,MSeifert04/astropy,dhomeier/astropy,dhomeier/astropy,larrybradley/astropy,stargaser/astropy,stargaser/astropy,funbaker/astropy,aleksandr-bakanov/astropy,aleksandr-bakanov/astropy,pllim/astropy,funbaker/astropy,mhvk/astropy,mhvk/astropy,bsipocz/astropy,dhomeier/astropy,MSeifert04/astropy,mhvk/astropy,larrybradley/astropy,StuartLittlefair/astropy,saimn/astropy,StuartLittlefair/astropy,DougBurke/astropy,larrybradley/astropy,DougBurke/astropy,dhomeier/astropy,bsipocz/astropy,saimn/astropy,StuartLittlefair/astropy,MSeifert04/astropy,astropy/astropy,larrybradley/astropy,astropy/astropy,saimn/astropy,astropy/astropy,bsipocz/astropy,aleksandr-bakanov/astropy,pllim/astropy,mhvk/astropy,astropy/astropy,lpsinger/astropy,aleksandr-bakanov/astropy,pllim/astropy,stargaser/astropy,astropy/astropy,larrybradley/astropy,dhomeier/astropy,pllim/astropy,mhvk/astropy