Fix post-merge errors.
Fix post-merge errors.

smoogipoo/osu,ZLima12/osu,RedNesto/osu,peppy/osu,naoey/osu,2yangk23/osu,Drezi126/osu,naoey/osu,nyaamara/osu,UselessToucan/osu,smoogipoo/osu,Nabile-Rahmani/osu,DrabWeb/osu,EVAST9919/osu,ZLima12/osu,smoogipooo/osu,Damnae/osu,peppy/osu,NeoAdonis/osu,UselessToucan/osu,NeoAdonis/osu,naoey/osu,osu-RP/osu-RP,ppy/osu,DrabWeb/osu,EVAST9919/osu,peppy/osu-new,johnneijzen/osu,Frontear/osuKyzer,DrabWeb/osu,NeoAdonis/osu,UselessToucan/osu,ppy/osu,ppy/osu,johnneijzen/osu,2yangk23/osu,smoogipoo/osu,peppy/osu,tacchinotacchi/osu