fix conflict

Author: azraelkuan

tensorflow_tts/models/melgan.py

@@ -376,8 +376,8 @@ def __init__(
                 discriminator += [
                     GroupConv1D(
                         filters=out_chs,
-                        kernel_size=downsample_scale,
-                        strides=downsample_scale * 10 + 1,
+                        kernel_size=downsample_scale * 10 + 1,
+                        strides=downsample_scale,
                         padding="same",
                         use_bias=use_bias,
                         groups=in_chs // 4,

tensorflow_tts/processor/ljspeech.py

@@ -122,7 +122,7 @@
 class LJSpeechProcessor(object):
     """LJSpeech processor."""
 
-    def __init__(self, data_dir, cleaner_names, target_rate=None, metadata_filename="metadata.csv"):
+    def __init__(self, data_dir, cleaner_names, target_rate=22050, metadata_filename="metadata.csv"):
         self.data_dir = data_dir
         self.cleaner_names = cleaner_names
 
@@ -195,4 +195,4 @@ def _arpabet_to_sequence(text):
 
 
 def _should_keep_symbol(s):
-    return s in _symbol_to_id and s != "_" and s != "~"
+    return s in _symbol_to_id and s != "_" and s != "~"