Fix changelog conflict
Fix changelog conflict
kolomiichenko/async,lonely8rain/async,SaiNadh001/async,scq000/async,abhishekgahlot/async,beni55/async,garysye/async,chaddm/async,renruixi/async,evdevgit/async,haggholm/async,zhhb/async,kolomiichenko/async,renruixi/async,suguru03/async,rlugojr/async,rlugojr/async,ibakaidov/async,scq000/async,andalm/async,mcanthony/async,carck/async,XM-Right/async,jamesjnadeau/async,DaAwesomeP/async,ariesnah/async,steverobb/async,llwanghong/async,DanieleTassone/async,rborisov/async,abhishekgahlot/async,Segeon-Kim/async,ecasilla/async,FrankSunnyvale/async,ezubarev/async,ibakaidov/async,wrenth04/async,caolan/async,andalm/async,ecasilla/async,beni55/async,gypsydave5/async,zhhb/async,ezubarev/async,imjerrybao/async,hargasinski/async,jnordberg/async,Zhang/async,moander/async,XM-Right/async,gypsydave5/async,DanieleTassone/async,Kikobeats/async,Segeon-Kim/async,KnottedRain/async,llwanghong/async,SaiNadh001/async,wrenth04/async,Zhang/async,moander/async,steverobb/async,rborisov/async,ariesnah/async,FrankSunnyvale/async,sjclijie/async,imjerrybao/async,Connectlegendary/async,KnottedRain/async,Segeon-Kim/async,garysye/async,RickyDan/async,lonely8rain/async,JulianVolodia/async,Kikobeats/async,xiebaochun/async,jaruba/async,suguru03/async,JulianVolodia/async,jamesjnadeau/async,jnordberg/async,arigo-software/async,carck/async,caolan/async,mcanthony/async,sjclijie/async,hargasinski/async,jaruba/async,evdevgit/async,DaAwesomeP/async,arigo-software/async,xiebaochun/async,haggholm/async,RickyDan/async,chaddm/async,Connectlegendary/async