From 8176b4ef77c5afa4214f1e638af4ce4e277eaef5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 14 Mar 2017 22:11:38 +0900
Subject: [PATCH] Fix merge errors.

---
 osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs     | 2 ++
 osu.Game/Modes/Score.cs                                  | 1 +
 osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs | 1 +
 3 files changed, 4 insertions(+)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 260f7fc8cc..18710432bf 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -10,8 +10,10 @@ using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Modes;
+using osu.Game.Modes.Mods;
 using osu.Game.Users;
 using osu.Game.Modes.Osu;
+using osu.Game.Modes.Osu.Mods;
 
 namespace osu.Desktop.VisualTests
 {
diff --git a/osu.Game/Modes/Score.cs b/osu.Game/Modes/Score.cs
index bf93605605..025eca9ab8 100644
--- a/osu.Game/Modes/Score.cs
+++ b/osu.Game/Modes/Score.cs
@@ -4,6 +4,7 @@
 using osu.Game.Users;
 using osu.Game.Database;
 using System.ComponentModel;
+using osu.Game.Modes.Mods;
 
 namespace osu.Game.Modes
 {
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 56ff736681..90d28bc0bf 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -16,6 +16,7 @@ using osu.Framework.Allocation;
 using System.Linq;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Extensions;
+using osu.Game.Modes.Mods;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {