Fix merge conflict

src/main/java/emu/grasscutter/command/commands/Stop.java → src/main/java/emu/grasscutter/command/commands/StopCommand.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Command(label = "stop", usage = "stop",
         description = "Stops the server", permission = "server.stop")
-public class Stop implements CommandHandler {
+public final class StopCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Weather.java → src/main/java/emu/grasscutter/command/commands/WeatherCommand.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Command(label = "weather", usage = "weather <weatherId>",
         description = "Changes the weather.", aliases = {"w"}, permission = "player.weather")
-public class Weather implements CommandHandler {
+public final class WeatherCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {