diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 9cb89d2b5d..b254e0b012 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -81,6 +81,7 @@ bool Launcher::AdvancedPage::loadSettings()
     if (unarmedFactorsStrengthIndex >= 0 && unarmedFactorsStrengthIndex <= 2)
         unarmedFactorsStrengthComboBox->setCurrentIndex(unarmedFactorsStrengthIndex);
 
+
     // Input Settings
     loadSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
     loadSettingBool(grabCursorCheckBox, "grab cursor", "Input");
@@ -140,6 +141,7 @@ void Launcher::AdvancedPage::saveSettings()
     if (unarmedFactorsStrengthIndex != mEngineSettings.getInt("strength influences hand to hand", "Game"))
         mEngineSettings.setInt("strength influences hand to hand", "Game", unarmedFactorsStrengthIndex);
 
+
     // Input Settings
     saveSettingBool(allowThirdPersonZoomCheckBox, "allow third person zoom", "Input");
     saveSettingBool(grabCursorCheckBox, "grab cursor", "Input");
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 76c007dc59..b308f21ace 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -22,7 +22,11 @@
         <x>0</x>
         <y>0</y>
         <width>641</width>
+<<<<<<< HEAD
         <height>998</height>
+=======
+        <height>968</height>
+>>>>>>> Fixed merge conflicts
        </rect>
       </property>
       <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
@@ -89,6 +93,7 @@
             </property>
             <property name="text">
              <string>Enchanted weapons are magical</string>
+<<<<<<< HEAD
              </property>
            </widget>
           </item>
@@ -100,6 +105,11 @@
             <property name="text">
              <string>Barter disposition change is permanent</string>
            <widget class="QCheckBox" name="strengthInfluencesHandToHand">
+=======
+            </property>
+           </widget>
+          </item>
+>>>>>>> Fixed merge conflicts
           <item alignment="Qt::AlignLeft">
            <widget class="QWidget" name="unarmedFactorsStrengthGroup" native="true">
             <property name="toolTip">