diff --git a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
index 44b26d46f7..860f2d7b87 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
@@ -19,7 +19,6 @@ namespace osu.Desktop.VisualTests
 {
     class TestCaseLeaderboard : TestCase
     {
-        public override string Name => @"Leaderboard";
         public override string Description => @"From song select";
 
         private Leaderboard leaderboard;
diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
index 82eae852a4..865eb88763 100644
--- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
@@ -14,6 +14,7 @@ using osu.Game.Modes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Allocation;
 using System.Linq;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Screens.Select.Leaderboards
 {
diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
index d1ac98eb95..0f3f629fd1 100644
--- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@@ -270,9 +270,9 @@ namespace osu.Game.Screens.Tournament
 
         private void addFlags()
         {
-            foreach (Team t in availableTeams)
+            foreach (Region r in availableTeams)
             {
-                Add(new ScrollingTeam(t)
+                Add(new ScrollingTeam(r)
                 {
                     X = leftPos + DrawWidth
                 });
diff --git a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
index 05c2efd7dc..76f871d202 100644
--- a/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
+++ b/osu.Game/Screens/Tournament/Teams/StorageBackedTeamList.cs
@@ -53,11 +53,7 @@ namespace osu.Game.Screens.Tournament.Teams
                             string acronym = split.Length >= 3 ? split[2].Trim() : teamName;
                             acronym = acronym.Substring(0, Math.Min(3, acronym.Length));
 
-<<<<<<< HEAD
-                            teams.Add(new Region()
-=======
-                            teams.Add(new Team
->>>>>>> 6f20473e65960e059727dee5dc075fc356d07c1b
+                            teams.Add(new Region
                             {
                                 FlagName = flagName,
                                 FullName = teamName,
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bc8244fa04..d470d9496a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -326,15 +326,12 @@
     <Compile Include="Screens\Select\Options\BeatmapOptionsEditButton.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
     <Compile Include="Screens\Select\Options\BeatmapOptionsRemoveFromUnplayedButton.cs" />
-<<<<<<< HEAD
     <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
     <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
     <Compile Include="Graphics\UserInterface\IHasDrawableRepresentation.cs" />
     <Compile Include="Users\Region.cs" />
     <Compile Include="Users\Badge.cs" />
-=======
     <Compile Include="IO\ArchiveReader.cs" />
->>>>>>> 6f20473e65960e059727dee5dc075fc356d07c1b
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">