rebase fix: fix imports

Author: proy30

src/python/impactx/dashboard/Input/shared.py

@@ -7,15 +7,9 @@
 """
 
 from .. import ctrl, state
-from ..Input.simulation_parameters import SimulationParameters
-<<<<<<< HEAD
 from . import DashboardDefaults
 from .utils import GeneralFunctions
-from .validation import DashboardValidation, SimulationValidation
-=======
-from . import DashboardDefaults, generalFunctions
 from .validation import DashboardValidation, sim_validator
->>>>>>> 3ef05f0b (refactor class to instance-based)
 
 simulation_parameters_defaults = list(DashboardDefaults.SIMULATION_PARAMETERS.keys())
 csr_defaults = list(DashboardDefaults.CSR.keys())