Follow Teil 2 Resolved Merge Conflicts

app/src/main/java/de/yannicpunktdee/yoshibot/command/YoshiCommandDistributor.java

@@ -115,8 +115,7 @@ public class YoshiCommandDistributor {
 		PAT,
 		BONK,
 		FOLLOW,
-		WIKIPEDIA,
-		BONK
+		WIKIPEDIA
 	}
 	
 	

app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java

@@ -61,7 +61,7 @@ public class DiscordEventListener extends ListenerAdapter {
 			if(nameToPlay == null) nameToPlay = event.getMember().getUser().getName();
 
 			PlayCommand.play(
-					SayCommand.buildTTSAudio(Resources.getRandomGreeting(nameToPlay)),
+					YoshiCommand.buildTTSAudio(Resources.getRandomGreeting(nameToPlay)),
 					event.getMember().getVoiceState().getChannel());
 		}
 	}
@@ -82,7 +82,7 @@ public class DiscordEventListener extends ListenerAdapter {
 			nameToPlay = nameToPlay == null ? event.getMember().getUser().getName() : nameToPlay;
 
 			PlayCommand.play(
-					SayCommand.buildTTSAudio(Resources.getRandomByebye(nameToPlay)),
+					YoshiCommand.buildTTSAudio(Resources.getRandomByebye(nameToPlay)),
 					event.getChannelLeft());
 		}
 	}