diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..b911660
Binary files /dev/null and b/.DS_Store differ
diff --git a/web_files/index.html b/web_files/index.html
index d67b605..9bbf64c 100644
--- a/web_files/index.html
+++ b/web_files/index.html
@@ -24,8 +24,15 @@
 	<body>
 		<div class="reveal">
 			<div class="slides">
+<<<<<<< HEAD
 				<section data-background-video="video/videos_nodo/cementerio1.3gp"><h2>Video</h2></section>
 				<section data-background-iframe=https://desertratilla.carto.com/builder/ce750541-5ea3-4f0c-893b-06263f4e8d34/embed></section>
+=======
+				<section>Slide 1</section>
+				<section>Slide 2</section>
+				<section>Slide 1</section>
+				<section>Slide 2</section>
+>>>>>>> 0b1c73acc9f5646128ab7b707243f54166c58aab
 			</div>
 		</div>
 
