diff --git a/src/util/colors.js b/src/util/colors.js
index da975bcf0..f52e38a20 100644
--- a/src/util/colors.js
+++ b/src/util/colors.js
@@ -38,17 +38,6 @@ export const colorScales = [
 ]
 
 // Returns a color brewer scale for a number of classes
-<<<<<<< HEAD
-export const getColorPalette = (scale, classes) => {
-    return colorbrewer[scale][classes] // .join(',')
-}
-
-// Returns color scale name for a palette
-export const getColorScale = (palette) => {
-    const classes = palette.length // palette.split(',').length
-    return colorScales.find(
-        (name) => colorbrewer[name][classes].join(',') === palette.join(',')
-=======
 export const getColorPalette = (scale, classes) => colorbrewer[scale][classes]
 
 // Returns color scale name for a palette
@@ -57,7 +46,6 @@ export const getColorScale = (palette) =>
     colorScales.find(
         (name) =>
             colorbrewer[name][palette.length].join(',') === palette.join(',')
->>>>>>> ee-dev
     )
 
 export const defaultColorScaleName = 'YlOrBr'