# Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
Also cleans up some weird code
# Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs
Also self-contains the tab options inside the tab control.