diff --git a/css/mana.css b/css/mana.css
index 1a208c4..115eca3 100644
--- a/css/mana.css
+++ b/css/mana.css
@@ -395,6 +395,7 @@
   left: 1.0em;
 }
 /**
+<<<<<<< HEAD
  * Half costs */
 .ms-half {
   width: .675em;
@@ -406,7 +407,7 @@
   margin-left: -0.675em;
 }
 /**
- * Planesalker symbols */
+ * Planeswalker symbols */
 .ms-loyalty-up,
 .ms-loyalty-down,
 .ms-loyalty-zero,
diff --git a/less/loyalty.less b/less/loyalty.less
index 213f9da..2e26f4a 100644
--- a/less/loyalty.less
+++ b/less/loyalty.less
@@ -1,5 +1,5 @@
 /**
- * Planesalker symbols */
+ * Planeswalker symbols */
 
 .@{ms-prefix}-loyalty {