Fix missed change in merge conflict...
Fix missed change in merge conflict...

UselessToucan/osu,peppy/osu,ppy/osu,smoogipoo/osu,NeoAdonis/osu,UselessToucan/osu,peppy/osu,peppy/osu,smoogipoo/osu,peppy/osu-new,ppy/osu,NeoAdonis/osu,smoogipoo/osu,NeoAdonis/osu,ppy/osu,UselessToucan/osu,smoogipooo/osu