Conflicts: app/src/main/java/de/yannicpunktdee/yoshibot/command/YoshiCommandDistributor.java app/src/main/java/de/yannicpunktdee/yoshibot/listeners/DiscordEventListener.java