Resolve conflicts

Author: niels9001

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs

@@ -402,17 +402,6 @@ private void ShortcutDialog_Opened(ContentDialog sender, ContentDialogOpenedEven
         _isActive = true;
     }
 
-    private void C_ResetClick(object sender, RoutedEventArgs e)
-    {
-        hotkeySettings = null;
-
-        SetValue(HotkeySettingsProperty, hotkeySettings);
-        SetKeys();
-
-        lastValidSettings = hotkeySettings;
-        shortcutDialog.Hide();
-    }
-
     private async void OpenDialogButton_Click(object sender, RoutedEventArgs e)
     {
         // c.Keys = null;