From 64b2b02b6c4b93d1d2752b04616e3253ef89f512 Mon Sep 17 00:00:00 2001
From: George Dang <53052793+gtdang@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:53:38 -0500
Subject: [PATCH] chore: resolve merge conflict

---
 hnn_core/gui/gui.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hnn_core/gui/gui.py b/hnn_core/gui/gui.py
index 68cf211d5..a2705ec0a 100644
--- a/hnn_core/gui/gui.py
+++ b/hnn_core/gui/gui.py
@@ -2076,7 +2076,10 @@ def _init_network_from_widgets(params, dt, tstop, single_simulation_data,
 
 
 def run_button_clicked(widget_simulation_name, log_out, drive_widgets,
-                       all_data, dt, tstop, ntrials, backend_selection,
+                       all_data, dt, tstop,
+                       fig_default_params, widget_default_smoothing,
+                       widget_min_frequency, widget_max_frequency,
+                       ntrials, backend_selection,
                        mpi_cmd, n_jobs, params, simulation_status_bar,
                        simulation_status_contents, connectivity_textfields,
                        viz_manager, simulations_list_widget,