fixed some merge issues

Author: polymorphicshade

app/src/main/java/org/schabi/newpipe/settings/SponsorBlockCategoriesSettingsFragment.java

@@ -37,31 +37,24 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_sponsor_color_key,
                                 R.color.sponsor_segment);
-
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_intro_color_key,
                                 R.color.intro_segment);
-
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_outro_color_key,
                                 R.color.outro_segment);
-
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_interaction_color_key,
                                 R.color.interaction_segment);
-
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_self_promo_color_key,
                                 R.color.self_promo_segment);
-
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_non_music_color_key,
                                 R.color.non_music_segment);
-
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_preview_color_key,
                                 R.color.preview_segment);
-                                
                         setColorPreference(editor,
                                 R.string.sponsor_block_category_filler_color_key,
                                 R.color.filler_segment);

app/src/main/java/org/schabi/newpipe/util/SponsorBlockUtils.java

@@ -98,7 +98,8 @@ public static VideoSegment[] getYouTubeVideoSegments(final Context context,
         }
         if (includePreviewCategory) {
             categoryParamList.add("preview");
-            
+        }
+
         if (includeFillerCategory) {
             categoryParamList.add("filler");
         }
@@ -286,6 +287,8 @@ static Integer parseSegmentCategory(
                     return colorStr == null
                             ? context.getResources().getColor(R.color.preview_segment)
                             : Color.parseColor(colorStr);
+                }
+                break;
             case "filler":
                 key = context.getString(R.string.sponsor_block_category_filler_key);
                 if (prefs.getBoolean(key, false)) {