fix merge conflicts

Author: bpm-mcgill

Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp

@@ -3,11 +3,11 @@
 #include "UIComponent_TutorialPopup.h"
 <<<<<<< HEAD
 #include "UISplitScreenHelpers.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 =======
 #include "../../Common/Tutorial/Tutorial.h"
 #include "../../../Minecraft.World/StringHelpers.h"