diff --git a/src/funcionesSimELectrica.py b/src/funcionesSimELectrica.py
index a7d1f21..01fd479 100644
--- a/src/funcionesSimELectrica.py
+++ b/src/funcionesSimELectrica.py
@@ -79,8 +79,8 @@ def simular_LTS(tensionCap, Rtotal, Lbobina, Ctotal, lts_path, tSim = 100e-3, to
 
     '''
 
-    modeloSim = "src/simulador/modelo_transitorio.asc"
-    outDir = 'src/simulador'
+    modeloSim = "simulador/modelo_transitorio.asc"
+    outDir = 'simulador'
 
     ## Hago la simulacion
 
@@ -125,9 +125,13 @@ def simular_LTS(tensionCap, Rtotal, Lbobina, Ctotal, lts_path, tSim = 100e-3, to
         
 if __name__ == '__main__':
 
+<<<<<<< HEAD
     import matplotlib.pyplot as plt
 
     lts_path = "C:/Users/osuescuneli/AppData/Local/Programs/ADI/LTspice/LTspice.exe"
+=======
+    lts_path = "D:\\Appdata\\LTSpice\\LTSPice.exe"
+>>>>>>> a2d05aa067ff48217660c219d56c5865db470197
 
     Tension = 300
     Resistencia = 10
diff --git a/src/simulador/modelo_transitorio_1.net b/src/simulador/modelo_transitorio_1.net
index c71b1cc..264dd90 100644
--- a/src/simulador/modelo_transitorio_1.net
+++ b/src/simulador/modelo_transitorio_1.net
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
+* C:\Users\pedro\Desktop\Projects\LaunchSim\src\simulador\modelo_transitorio.asc
+* Generated by LTspice 24.1.4 for Windows.
+=======
 * C:\Users\osuescuneli\Desktop\practicas\Practia_Lanzadera\source\src\simulador\modelo_transitorio.asc
 * Generated by LTspice 24.1.5 for Windows.
+>>>>>>> 04076e92921df836051a54c4429533fbd2cea3a7
 V1 N001 0 {V}
 S1 N001 condensador cont1 0 SW
 V2 cont1 0 PULSE(0 10 0 1n 1n {toff_sw} {tsim})
@@ -12,7 +17,7 @@ V4 N002 N003 30
 R2 N002 N003 20
 .model NMOS NMOS
 .model PMOS PMOS
-.lib C:\Users\osuescuneli\AppData\Local\LTspice\lib\cmp\standard.mos
+.lib C:\Users\pedro\AppData\Local\LTspice\lib\cmp\standard.mos
 .tran 0 {tsim} 0
 .Model SW SW(Ron=1m Roff=100Meg Vt = 5)
 .param tsim 10
diff --git a/src/geometry_viewer.py b/src/tabs/geometry_viewer.py
similarity index 100%
rename from src/geometry_viewer.py
rename to src/tabs/geometry_viewer.py