From 309710c1aa98b2b6b07d0212595bbe32e96c9617 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 28 Dec 2015 16:10:51 -0500
Subject: [PATCH] fix merge conflict

---
 MediaBrowser.Providers/Manager/ProviderManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 477ff167c..580e9c4ac 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -1038,7 +1038,7 @@ namespace MediaBrowser.Providers.Manager
                                         .ToList();
 
             var musicArtists = albums
-                .Select(i => i.GetParent())
+                .Select(i => i.Parent)
                 .OfType<MusicArtist>()
                 .ToList();