diff --git a/frontend/frontend.js b/frontend/frontend.js
index b7a3724..7861ebe 100644
--- a/frontend/frontend.js
+++ b/frontend/frontend.js
@@ -48,11 +48,7 @@ function graphSpectralData (obj, dom) {
       responsive: false,
       legend: {
         labels: {
-<<<<<<< HEAD
-          fontColor: '#ffffff'
-=======
-          fontcolor: '#ffffff'
->>>>>>> e21efc1b4a57fb153e2bbc832e44354dd9aa5d31
+          fontColor: '#fff'
         }
       }
     }