diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
index 182f038a9..2c151a214 100644
--- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
@@ -423,6 +423,7 @@ namespace Ryujinx.UI.Common.Configuration
             /// </summary>
             public ReactiveObject<List<InputConfig>> InputConfig { get; private set; }
 
+
             public HidSection()
             {
                 EnableKeyboard = new ReactiveObject<bool>();
@@ -1546,6 +1547,10 @@ namespace Ryujinx.UI.Common.Configuration
             Hid.Hotkeys.Value = configurationFileFormat.Hotkeys;
             Hid.InputConfig.Value = configurationFileFormat.InputConfig;
             
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5239ec712d5915a211a083d39764736dd02040e5
             if (Hid.InputConfig.Value == null)
             {
                 Hid.InputConfig.Value = new List<InputConfig>();
diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index 0ee74b700..44ee75f96 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -124,6 +124,7 @@ namespace Ryujinx.Ava
         public bool ScreenshotRequested { get; set; }
 
         public AppHost(
+            
             RendererHost renderer,
             InputManager inputManager,
             string applicationPath,
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 2ec5ab815..1de745138 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -408,6 +408,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             ShowConfirmExit = config.ShowConfirmExit;
             HideCursor = (int)config.HideCursor.Value;
             CursorHideIdleTime = config.CursorHideIdleTime.Value;
+<<<<<<< HEAD
+=======
+            
+
+>>>>>>> 5239ec712d5915a211a083d39764736dd02040e5
 
             GameDirectories.Clear();
             GameDirectories.AddRange(config.UI.GameDirs.Value);