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

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