diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index 60dd68cb8..d513dbdee 100644
--- a/app/javascript/styles/macaron/diff.scss
+++ b/app/javascript/styles/macaron/diff.scss
@@ -155,7 +155,6 @@ html {
 
 .muted .poll__chart {
   background: rgba($purple, 0.8);
->>>>>>> 3da7ff7230a4de11f87724aa1d33d776f0616706
 }
 
 .poll__chart.leading {