From 3a05ddb982c7ad8a02e27d258cc022dc8787a5a1 Mon Sep 17 00:00:00 2001
From: Andrew Lanzone <andy@enoznal.com>
Date: Sun, 6 Jul 2025 23:17:00 -0700
Subject: [PATCH] Fix issues caused by incomplete merge

---
 apps/openmw/mwgui/inventorywindow.cpp | 3 +--
 apps/openmw/mwgui/tradewindow.cpp     | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index f18e8fdcbb..0e8c67f8bd 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -90,9 +90,8 @@ namespace MWGui
         , mLastYSize(0)
         , mPreview(std::make_unique<MWRender::InventoryPreview>(parent, resourceSystem, MWMechanics::getPlayer()))
         , mTrading(false)
-        , mUpdateTimer(0.f)
-        , mPendingControllerAction(ControllerAction::None)
         , mUpdateNextFrame(false)
+        , mPendingControllerAction(ControllerAction::None)
     {
         mPreviewTexture
             = std::make_unique<osgMyGUI::OSGTexture>(mPreview->getTexture(), mPreview->getTextureStateSet());
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 0c75779957..df7c0bda36 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -694,7 +694,6 @@ namespace MWGui
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Barter);
     }
 
-<<<<<<< HEAD
     bool TradeWindow::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)
     {
         if (arg.button == SDL_CONTROLLER_BUTTON_A)