Fix docstring

TTS/tts/datasets/__init__.py

@@ -13,6 +13,7 @@ def split_dataset(items, eval_split_max_size=None, eval_split_size=0.01):
     """Split a dataset into train and eval. Consider speaker distribution in multi-speaker training.
 
     Args:
+<<<<<<< HEAD
         items (List[List]):
             A list of samples. Each sample is a list of `[audio_path, text, speaker_id]`.
 
@@ -22,6 +23,9 @@ def split_dataset(items, eval_split_max_size=None, eval_split_size=0.01):
         eval_split_size (float):
             If between 0.0 and 1.0 represents the proportion of the dataset to include in the evaluation set.
             If > 1, represents the absolute number of evaluation samples. Defaults to 0.01 (1%).
+=======
+        items (List[List]): A list of samples. Each sample is a list of `[text, audio_path, speaker_id]`.
+>>>>>>> Fix docstring
     """
     speakers = [item["speaker_name"] for item in items]
     is_multi_speaker = len(set(speakers)) > 1
@@ -68,7 +72,7 @@ def load_tts_samples(
 
         formatter (Callable, optional): The preprocessing function to be applied to create the list of samples. It
             must take the root_path and the meta_file name and return a list of samples in the format of
-            `[[audio_path, text, speaker_id], ...]]`. See the available formatters in `TTS.tts.dataset.formatter` as
+            `[[text, audio_path, speaker_id], ...]]`. See the available formatters in `TTS.tts.dataset.formatter` as
             example. Defaults to None.
 
         eval_split_max_size (int):