# Conflicts: # osu-framework # osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs # osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
Closes #2634.
Closes #2149.
No reason for it to be a container.
codefactor.io \(o.o)/ also one unnecessary semicolon
(cherry picked from commit 079827d)
(cherry picked from commit 2b6d991)
(cherry picked from commit d353158)