# Conflicts: # osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
Turns out this was unnecessary and never actually being used.
# Conflicts: # osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableRimHit.cs # osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs