Move changelog entry to the top and fix conflict [ci skip]
Move changelog entry to the top and fix conflict [ci skip]

palkan/rails,bradleypriest/rails,mijoharas/rails,georgeclaghorn/rails,betesh/rails,untidy-hair/rails,rossta/rails,esparta/rails,mechanicles/rails,yhirano55/rails,jeremy/rails,travisofthenorth/rails,koic/rails,elfassy/rails,utilum/rails,ttanimichi/rails,palkan/rails,MichaelSp/rails,eileencodes/rails,ngpestelos/rails,arjes/rails,odedniv/rails,tgxworld/rails,repinel/rails,eileencodes/rails,bogdanvlviv/rails,kddeisz/rails,Sen-Zhang/rails,gcourtemanche/rails,ttanimichi/rails,tjschuck/rails,gavingmiller/rails,mijoharas/rails,coreyward/rails,arjes/rails,georgeclaghorn/rails,flanger001/rails,schuetzm/rails,hanystudy/rails,joonyou/rails,felipecvo/rails,assain/rails,tgxworld/rails,kirs/rails-1,kenta-s/rails,yalab/rails,aditya-kapoor/rails,kamipo/rails,illacceptanything/illacceptanything,MSP-Greg/rails,pschambacher/rails,matrinox/rails,utilum/rails,ledestin/rails,mathieujobin/reduced-rails-for-travis,kmcphillips/rails,joonyou/rails,88rabbit/newRails,fabianoleittes/rails,riseshia/railsguides.kr,tijwelch/rails,brchristian/rails,MSP-Greg/rails,mtsmfm/rails,vipulnsward/rails,pvalena/rails,assain/rails,MSP-Greg/rails,Edouard-chin/rails,Spin42/rails,fabianoleittes/rails,ledestin/rails,arunagw/rails,gcourtemanche/rails,arunagw/rails,voray/rails,pvalena/rails,alecspopa/rails,richseviora/rails,starknx/rails,odedniv/rails,gfvcastro/rails,rails/rails,illacceptanything/illacceptanything,fabianoleittes/rails,maicher/rails,yalab/rails,vassilevsky/rails,kamipo/rails,rbhitchcock/rails,deraru/rails,amoody2108/TechForJustice,EmmaB/rails-1,vipulnsward/rails,maicher/rails,baerjam/rails,Envek/rails,printercu/rails,vipulnsward/rails,prathamesh-sonpatki/rails,xlymian/rails,mechanicles/rails,lcreid/rails,riseshia/railsguides.kr,Erol/rails,notapatch/rails,rafaelfranca/omg-rails,samphilipd/rails,gcourtemanche/rails,lucasmazza/rails,yhirano55/rails,kenta-s/rails,stefanmb/rails,yawboakye/rails,mtsmfm/rails,hanystudy/rails,vassilevsky/rails,rbhitchcock/rails,BlakeWilliams/rails,marklocklear/rails,kddeisz/rails,notapatch/rails,Envek/rails,baerjam/rails,88rabbit/newRails,stefanmb/rails,lucasmazza/rails,eileencodes/rails,georgeclaghorn/rails,marklocklear/rails,jeremy/rails,bogdanvlviv/rails,mtsmfm/railstest,Edouard-chin/rails,ttanimichi/rails,Spin42/rails,rbhitchcock/rails,illacceptanything/illacceptanything,shioyama/rails,sergey-alekseev/rails,bolek/rails,schuetzm/rails,Stellenticket/rails,assain/rails,yasslab/railsguides.jp,coreyward/rails,starknx/rails,assain/rails,kirs/rails-1,Erol/rails,alecspopa/rails,esparta/rails,notapatch/rails,Stellenticket/rails,mijoharas/rails,mathieujobin/reduced-rails-for-travis,printercu/rails,repinel/rails,printercu/rails,utilum/rails,samphilipd/rails,mohitnatoo/rails,BlakeWilliams/rails,gfvcastro/rails,shioyama/rails,xlymian/rails,Envek/rails,shioyama/rails,yalab/rails,alecspopa/rails,illacceptanything/illacceptanything,mohitnatoo/rails,deraru/rails,travisofthenorth/rails,koic/rails,BlakeWilliams/rails,palkan/rails,MichaelSp/rails,koic/rails,palkan/rails,deraru/rails,EmmaB/rails-1,untidy-hair/rails,kaspth/rails,prathamesh-sonpatki/rails,rossta/rails,marklocklear/rails,vipulnsward/rails,ledestin/rails,tjschuck/rails,gauravtiwari/rails,iainbeeston/rails,rails/rails,aditya-kapoor/rails,kaspth/rails,Vasfed/rails,sergey-alekseev/rails,brchristian/rails,tgxworld/rails,Stellenticket/rails,illacceptanything/illacceptanything,baerjam/rails,yawboakye/rails,aditya-kapoor/rails,mathieujobin/reduced-rails-for-travis,illacceptanything/illacceptanything,bradleypriest/rails,sergey-alekseev/rails,xlymian/rails,jeremy/rails,pschambacher/rails,ngpestelos/rails,Vasfed/rails,arunagw/rails,starknx/rails,kmcphillips/rails,odedniv/rails,georgeclaghorn/rails,gauravtiwari/rails,baerjam/rails,yahonda/rails,MSP-Greg/rails,mtsmfm/railstest,yahonda/rails,88rabbit/newRails,untidy-hair/rails,travisofthenorth/rails,yhirano55/rails,mohitnatoo/rails,illacceptanything/illacceptanything,Erol/rails,Sen-Zhang/rails,yhirano55/rails,flanger001/rails,iainbeeston/rails,bradleypriest/rails,gauravtiwari/rails,tgxworld/rails,yahonda/rails,kaspth/rails,kamipo/rails,esparta/rails,rails/rails,kddeisz/rails,maicher/rails,felipecvo/rails,betesh/rails,sealocal/rails,yahonda/rails,yalab/rails,coreyward/rails,EmmaB/rails-1,lcreid/rails,Edouard-chin/rails,ngpestelos/rails,amoody2108/TechForJustice,betesh/rails,yasslab/railsguides.jp,rafaelfranca/omg-rails,notapatch/rails,gavingmiller/rails,matrinox/rails,betesh/rails,richseviora/rails,kirs/rails-1,mtsmfm/rails,stefanmb/rails,aditya-kapoor/rails,voray/rails,bogdanvlviv/rails,mohitnatoo/rails,Envek/rails,travisofthenorth/rails,kmayer/rails,Spin42/rails,illacceptanything/illacceptanything,sealocal/rails,kenta-s/rails,richseviora/rails,tijwelch/rails,utilum/rails,kmcphillips/rails,illacceptanything/illacceptanything,tjschuck/rails,kachick/rails,jeremy/rails,felipecvo/rails,kddeisz/rails,kmayer/rails,deraru/rails,bogdanvlviv/rails,prathamesh-sonpatki/rails,tijwelch/rails,fabianoleittes/rails,repinel/rails,Edouard-chin/rails,riseshia/railsguides.kr,elfassy/rails,illacceptanything/illacceptanything,rails/rails,mechanicles/rails,prathamesh-sonpatki/rails,bolek/rails,kachick/rails,iainbeeston/rails,elfassy/rails,gavingmiller/rails,untidy-hair/rails,Erol/rails,illacceptanything/illacceptanything,eileencodes/rails,kmayer/rails,printercu/rails,rafaelfranca/omg-rails,pvalena/rails,Vasfed/rails,repinel/rails,pvalena/rails,arjes/rails,Stellenticket/rails,shioyama/rails,mechanicles/rails,gfvcastro/rails,pschambacher/rails,BlakeWilliams/rails,samphilipd/rails,yawboakye/rails,flanger001/rails,arunagw/rails,illacceptanything/illacceptanything,esparta/rails,flanger001/rails,schuetzm/rails,amoody2108/TechForJustice,kachick/rails,joonyou/rails,joonyou/rails,gfvcastro/rails,lucasmazza/rails,Vasfed/rails,yasslab/railsguides.jp,lcreid/rails,vassilevsky/rails,schuetzm/rails,kmcphillips/rails,brchristian/rails,MichaelSp/rails,rossta/rails,illacceptanything/illacceptanything,illacceptanything/illacceptanything,hanystudy/rails,mtsmfm/railstest,tjschuck/rails,yawboakye/rails,sealocal/rails,Sen-Zhang/rails,yasslab/railsguides.jp,riseshia/railsguides.kr,bolek/rails,matrinox/rails,lcreid/rails,voray/rails,illacceptanything/illacceptanything,iainbeeston/rails