diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 9ce405b..963a006 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -175,26 +175,26 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "b40a18c39aef8e17",
+  "active": "e1d369c3109e86c5",
   "lastOpenFiles": [
-    "TERCERO/ATR1/Teoría_2425.md",
-    "Pasted image 20241127111215.png",
-    "Pasted image 20241127110759.png",
+    "conflict-files-obsidian-git.md",
     "TERCERO/IA/Teoría_2425.md",
-    "Sin título.png",
-    "Pasted image 20241127091943.png",
-    "Pasted image 20241127091902.png",
-    "Pasted image 20241127091731.png",
-    "Pasted image 20241127091611.png",
-    "TERCERO/ATR1/images/Captura de pantalla de 2024-11-20 10-54-39.png",
-    "TERCERO/ATR1/images/Pasted image 20241125141142.png",
-    "TERCERO/ATR1/images/Pasted image 20241125145544.png",
+    "TERCERO/SS/images/Pasted image 20241125145544.png",
+    "TERCERO/SS/images/Pasted image 20241125145439.png",
+    "TERCERO/SS/images/Pasted image 20241125145413.png",
+    "TERCERO/SS/images/Pasted image 20241125145411.png",
+    "TERCERO/SS/images/Pasted image 20241125145409.png",
+    "TERCERO/SS/images/Pasted image 20241125144536.png",
+    "TERCERO/SS/images/Pasted image 20241125144533.png",
+    "TERCERO/SS/images/Pasted image 20241125143529.png",
+    "TERCERO/SS/images/Pasted image 20241125141145.png",
+    "TERCERO/SS/images/Pasted image 20241125141142.png",
+    "TERCERO/ATR1/Teoría_2425.md",
     "TERCERO/SS/SS 24-25.md",
     "TERCERO/SPD/Teoría_2425.md",
     "Untitled.md",
     "TERCERO/ATR1/Resolución 1 Parcial ATR1.md",
     "TERCERO/ATR1/Ejercicios.md",
-    "conflict-files-obsidian-git.md",
     "TERCERO/SPD/P4_SPD.md",
     "TERCERO/SS/SS Lab.md",
     "SEGUNDO/ADDA/Teoría_2324.md",
diff --git a/SEGUNDO/IISSI1/Teoría_2324.md b/SEGUNDO/IISSI1/Teoría_2324.md
index 600d649..8361125 100644
--- a/SEGUNDO/IISSI1/Teoría_2324.md
+++ b/SEGUNDO/IISSI1/Teoría_2324.md
@@ -819,7 +819,7 @@ Las instrucciones en un bloque `BEGIN-END` están separadas por un delimitador d
 ## 12.1. Concepto de transacción
 Una transacción es una secuencia de operaciones DML que se comporta como una unidad lógica de trabajo. Los puntos de sincronismo (synchronization points) definen el estado de la transacción: `START TRANSACTION`, `COMMIT`, `ROLLBACK`.
 Las transacciones deben cumplir las características ACID (Atomicity Consistency Isolation Durability).
-- **Atomicity:** si se confirman (`COMMIT`), se ejecutan todas, si no                (`ROLLBACK`), no se ejecuta ninguna.
+- **Atomicity:** si se confirman (`COMMIT`), se ejecutan todas, si no (`ROLLBACK`), no se ejecuta ninguna.
 - **Consistency:** A partir de un estado consistente $S_0$ se deja la BDD en otro estado consistente $S_1$.
 - **Isolation:** se realiza como si fuera la única transacción.
 - **Durability:** Si se confirma, los cambios se hacen persistentes y si se cancela, el estado debe ser el inicial.
diff --git a/Pasted image 20241127091611.png b/TERCERO/IA/images/Pasted image 20241127091611.png
similarity index 100%
rename from Pasted image 20241127091611.png
rename to TERCERO/IA/images/Pasted image 20241127091611.png
diff --git a/Pasted image 20241127091731.png b/TERCERO/IA/images/Pasted image 20241127091731.png
similarity index 100%
rename from Pasted image 20241127091731.png
rename to TERCERO/IA/images/Pasted image 20241127091731.png
diff --git a/Pasted image 20241127091902.png b/TERCERO/IA/images/Pasted image 20241127091902.png
similarity index 100%
rename from Pasted image 20241127091902.png
rename to TERCERO/IA/images/Pasted image 20241127091902.png
diff --git a/Pasted image 20241127091943.png b/TERCERO/IA/images/Pasted image 20241127091943.png
similarity index 100%
rename from Pasted image 20241127091943.png
rename to TERCERO/IA/images/Pasted image 20241127091943.png
diff --git a/Sin título.png b/TERCERO/IA/images/Sin título.png
similarity index 100%
rename from Sin título.png
rename to TERCERO/IA/images/Sin título.png
diff --git a/TERCERO/SS/images/Pasted image 20241125141142.png b/TERCERO/SS/images/Pasted image 20241125141142.png
new file mode 100644
index 0000000..1019cbf
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125141142.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125141145.png b/TERCERO/SS/images/Pasted image 20241125141145.png
new file mode 100644
index 0000000..1019cbf
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125141145.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125143529.png b/TERCERO/SS/images/Pasted image 20241125143529.png
new file mode 100644
index 0000000..0bc3556
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125143529.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125144533.png b/TERCERO/SS/images/Pasted image 20241125144533.png
new file mode 100644
index 0000000..0a0557e
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125144533.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125144536.png b/TERCERO/SS/images/Pasted image 20241125144536.png
new file mode 100644
index 0000000..0a0557e
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125144536.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125145409.png b/TERCERO/SS/images/Pasted image 20241125145409.png
new file mode 100644
index 0000000..21856fc
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125145409.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125145411.png b/TERCERO/SS/images/Pasted image 20241125145411.png
new file mode 100644
index 0000000..21856fc
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125145411.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125145413.png b/TERCERO/SS/images/Pasted image 20241125145413.png
new file mode 100644
index 0000000..21856fc
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125145413.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125145439.png b/TERCERO/SS/images/Pasted image 20241125145439.png
new file mode 100644
index 0000000..567c2de
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125145439.png differ
diff --git a/TERCERO/SS/images/Pasted image 20241125145544.png b/TERCERO/SS/images/Pasted image 20241125145544.png
new file mode 100644
index 0000000..aab4b59
Binary files /dev/null and b/TERCERO/SS/images/Pasted image 20241125145544.png differ
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 0000000..d8bbd4f
--- /dev/null
+++ b/conflict-files-obsidian-git.md
@@ -0,0 +1,17 @@
+# Conflicts
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- Not a file: .obsidian/workspace.json
+
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+```diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+```
\ No newline at end of file