Fixed merge conflicts

NzbDrone.Backbone/Controller.js

@@ -2,7 +2,7 @@
         'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView',
         'Calendar/CalendarCollectionView', 'Shared/NotificationView',
         'Shared/NotFoundView', 'MainMenuView', 'HeaderView',
-        'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection'],
+        'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
         'Settings/SettingsLayout'],
         function (app, modalRegion) {
 

NzbDrone.Backbone/app.js

@@ -30,7 +30,7 @@ define('app',  function () {
 
     window.NzbDrone = new Backbone.Marionette.Application();
     window.NzbDrone.Series = {};
-        window.NzbDrone.Series.Index = {};
+    window.NzbDrone.Series.Index = {};
     window.NzbDrone.Series.Edit = {};
     window.NzbDrone.Series.Delete = {};
     window.NzbDrone.Series.Details = {};