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

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