diff --git a/projects/configgen/configgen/generators/supermodel/supermodelControllers.py b/projects/configgen/configgen/generators/supermodel/supermodelControllers.py
index 941caf66510d2fa0e05299b18d047a27e517781f..65cb2e253c7edcb11306a922f985a4661a3b5283 100644
--- a/projects/configgen/configgen/generators/supermodel/supermodelControllers.py
+++ b/projects/configgen/configgen/generators/supermodel/supermodelControllers.py
@@ -422,6 +422,21 @@ def generateControllerConfig(self, playersControllers: ControllerPerPlayer):
                 inp = pad.Input(DIGITAL_JOYSTICK_P2[x])
                 supermodelControllersSettings.setString(self.SECTION_GLOBAL, x, '"{}_{}"'.format(padIndex, getConfigValueJ2(inp)))
 
+<<<<<<< Updated upstream
+=======
+        if pad.PlayerIndex == 2 and is_guncon:
+            for x in GUNCON_JOY:
+                supermodelControllersSettings.setString(self.SECTION_GLOBAL, x, '"{}_{}"'.format(padIndex, GUNCON_JOY[x]))
+
+        if pad.PlayerIndex == 2 and is_jamma:
+            for x in JAMMA_CONTROL_P2:
+                if JAMMA_CONTROL_P2[x] != -1:
+                    print("CONFIGURE P2")
+                    supermodelControllersSettings.setString(self.SECTION_GLOBAL, "{}2".format(x), '"{}_BUTTON{}"'.format(padIndex, JAMMA_CONTROL_P2[x] + 1))
+                else:
+                    supermodelControllersSettings.setString(self.SECTION_GLOBAL, x, '')
+
+>>>>>>> Stashed changes
         break
 
     # Save configuration