Conflicts: NzbDrone.Core.Test/ProviderTests/DiskScanProviderTest.cs NzbDrone.Core.Test/ProviderTests/MediaFileProviderTests.cs