diff --git a/index.html b/index.html
index 64d8ee0..4c76907 100644
--- a/index.html
+++ b/index.html
@@ -26,9 +26,12 @@
                 <a href="https://fr.wikipedia.org/wiki/Violence">Violence</a>
                 <a href="https://fr.wikipedia.org/wiki/Fascisme">Fascisme</a>
                 <a href="https://fr.wikipedia.org/wiki/Anarchisme">Communisme/Anarchisme</a>   
+<<<<<<< HEAD
                 <a href="https://fr.wikipedia.org/wiki/F%C3%A9minisme">Féminisme</a>
                 <a href="https://fr.wikipedia.org/wiki/Handicap">Handicap</a>
                 <a href="https://fr.wikipedia.org/wiki/%C3%89tudes_d%C3%A9coloniales">Décolonialisme</a>
+=======
+>>>>>>> 76755f20aaebcc4c0067d5eaeba29d846b5c8135
             </div>
         </div>
     </div>
diff --git a/style.css b/style.css
index b0c7940..09ef0b0 100644
--- a/style.css
+++ b/style.css
@@ -1,4 +1,5 @@
 body {
+<<<<<<< HEAD
     text-align: center;
   }
   body h1 {
@@ -45,4 +46,40 @@ body {
     font-size: 2rem;
     text-decoration: none;
     color: white;
-  }/*# sourceMappingURL=style.css.map */
\ No newline at end of file
+  }/*# sourceMappingURL=style.css.map */
+=======
+  text-align: center;
+}
+body h1 {
+  color: white;
+  margin-top: 0%;
+  margin-bottom: 0%;
+  font-size: 4rem;
+  -webkit-text-stroke: 2px black;
+  background-image: url(https://www.publicdomainpictures.net/pictures/230000/velka/red-fox-1500907744R2q.jpg);
+  background-size: contain;
+  height: 20vh;
+}
+body .site_content {
+  display: flex;
+  flex-direction: row;
+}
+body .site_content .main_content h2 {
+  color: red;
+}
+body .site_content .vertical_banner {
+  color: white;
+  background-color: #9F0A0A;
+}
+body .site_content .vertical_banner .category {
+  display: flex;
+  flex-direction: column;
+  gap: 1vh;
+  margin: 5px;
+  margin-top: 2%;
+}
+body .site_content .vertical_banner .category a:visited {
+  text-decoration: none;
+  color: white;
+}/*# sourceMappingURL=style.css.map */
+>>>>>>> 76755f20aaebcc4c0067d5eaeba29d846b5c8135