Manually resolved merge conflicts

This specific commit isn't compilable, since StatisticsUtils hasn't been updated to match the new Form style.

connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java

@@ -139,7 +139,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
     @Override
     public boolean handle(ModalFormResponsePacket packet) {
         session.getFormCache().handleResponse(packet);
-        return true; //todo change the Statistics Form to match the new style
+        return true;
     }
 
     private boolean couldLoginUserByName(String bedrockUsername) {

connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java

@@ -37,7 +37,7 @@ import org.geysermc.connector.network.translators.world.block.BlockTranslator;
 
 import java.util.Map;
 
-public class StatisticsUtils {
+public class StatisticsUtils { //todo make Geyser compilable
 
     // Used in UpstreamPacketHandler.java
     public static final int STATISTICS_MENU_FORM_ID = 1339;