diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/Purebas.txt b/Purebas.txt
new file mode 100644
index 0000000..c108ef8
--- /dev/null
+++ b/Purebas.txt
@@ -0,0 +1 @@
+Archivo para prueba conflicto v1-v2
\ No newline at end of file
diff --git a/README.md b/README.md
index 4b0c94a..e5aaaef 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,92 @@
+# GitHub for Developers  
+NO MAS CAMBIOS
+GTM
+4
+
+- Class Date: THIS-DATE
+- Facilitator01: @teacher
+
+- Class Date: THIS-DATE
+- Facilitator: @omarvasquezv2-v3
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com 
+- Facilitator01: @prozoc afa arriba jcortes Tamaguchi
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com 
+- Facilitator01: @prozoc afa arriba jcortes jjjj 
+- Facilitator01: @prozoc afa arriba jcortes larciniegasr
+- Facilitator: @prozoclocal
+- Facilitator: @dianuser
+- Facilitator01: @prozoc , @jcollanter
+- Facilitator: @Sustancial
+- Facilitator: @TEACHER-HANDLE mod 1
+- Facilitator: @HeidiSanchez
+- Facilitator: @TEACHER-HANDLE - jlopezr2_local2
+- Facilitator: @jbalcerol
+- Facilitator: @avargasd
+
+- Facilitator:@JORGE SALAZAR
+#cAPACITACION github - 07MAY2024
+
+
+CAMBIO LARCINIEGASR 
+CAMBIO PARTE2 LABORATORIO
+
+- Class Date: THIS-DATE
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com 
+- Facilitator01: @prozoc afa arriba jcortes Tamaguchi
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com 
+- Facilitator01: @prozoc afa arriba jcortes jjjj 
+- Facilitator01: @prozoc afa arriba jcortes larciniegasr
+- Facilitator: @prozoclocal
+- Facilitator: @dianuser
+- Facilitator01: @prozoc , @jcollanter
+- Class Date: THIS-DATEjjjjj
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com visual
+- Facilitator: @gpinzond
+- Facilitator: @Sustancial
+- Facilitator: @TEACHER-HANDLE mod 1
+- Facilitator: @HeidiSanchez
+- Facilitator: @TEACHER-HANDLE - jlopezr2_local2
+- Facilitator: @jbalcerol
+- Facilitator:@JORGE SALAZAR
+- Facilitator: @avargasd
+
+
+- Class Date: THIS-DATE
+- Facilitator: @TEACHER-HANDLE
+
+
+## Class Resources
+
+# CSEGURA mod 1
+## Class Resourceskk
+#JFA
 # GitHub for Developers
 
 - Class Date: THIS-DATE
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com 
+- Facilitator01: @prozoc afa arriba jcortes Tamaguchi
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com 
+- Facilitator01: @prozoc afa arriba jcortes jjjj 
+- Facilitator01: @prozoc afa arriba jcortes larciniegasr
+- Facilitator: @prozoclocal
+- Facilitator: @dianuser
+- Facilitator01: @prozoc , @jcollanter
+- Class Date: THIS-DATEjjjjj
+- Facilitator01: @prozoc afa arriba jcortes DevDavid.com visual
+- Facilitator: @Sustancial
+- Facilitator: @TEACHER-HANDLE mod 1
+- Facilitator: @HeidiSanchez
+- Facilitator: @TEACHER-HANDLE - jlopezr2_local2
+- Facilitator: @jbalcerol
+
+- Facilitator:@JORGE SALAZAR
+- Facilitator:@eggp73
+
 - Facilitator: @TEACHER-HANDLE
 
 ## Class Resources
 
+
 - [GitHub for Developers Manual](https://githubtraining.github.io/training-manual/#/)
 - [Introduction to GitHub Flow](https://guides.github.com/introduction/flow/)
 
@@ -58,3 +140,6 @@ After you have completed this course, you are probably wondering where to go fro
 - [GitHub Learning Lab](https://lab.github.com/): self-paced courses with instant bot-assisted feedback.
 - [Microsoft Learn for GitHub](https://docs.microsoft.com/en-us/learn/github/)
 - [Join the open source community](https://github.com/open-source)
+
+
+### modificado AFA V1
\ No newline at end of file
diff --git a/index.html b/index.html
index 2b048f7..0d5f5fa 100755
--- a/index.html
+++ b/index.html
@@ -1,4 +1,6 @@
 ---
+layout: presentation 123-v2
+--------
 layout: presentation
 ---
 
@@ -11,3 +13,8 @@
 <section id="overview" class="step" {% for attr in site.overview-data %} data-{{attr[0]}}="{{attr[1]}}"{% endfor %}></section>
 {% endif %}
 {% endunless %}
+
+--- 
+MODIFICADO AFA
+---
+CAMBIO INDEX LABORATORIO 2
\ No newline at end of file
diff --git a/pruebas.txt b/pruebas.txt
new file mode 100644
index 0000000..c063859
--- /dev/null
+++ b/pruebas.txt
@@ -0,0 +1 @@
+Archivo de prueba para conflicto
\ No newline at end of file