diff --git a/styles/yoshi.css b/styles/yoshi.css
index 9c340d0..0eebb12 100644
--- a/styles/yoshi.css
+++ b/styles/yoshi.css
@@ -165,7 +165,10 @@ a:hover {
   display: block;
   font-weight: 700;
   border: unset;
+<<<<<<< HEAD
   /* color: rgba(180, 64, 134, 0.5); */
+=======
+>>>>>>> d5de3bd80a2e71d61cf38a6399bd7b6e57719618
   color: rgba(37, 176, 118, 0.25);
 }