diff --git a/webpack.config.js b/webpack.config.js
index 601e096105c3acc48692b856399aa5baa6b2780c..eec4f65837c592cc25f84cbbdefe9e6ff9a4c399 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -49,15 +49,10 @@ module.exports = environment => {
                         {
                             loader: 'sass-loader',
                             options: {
-<<<<<<< HEAD
-                                indentedSyntax: false,
-                                data: "$primaryBackground: " + primaryBackground + '; ' +
-=======
                                 sassOptions: {
                                     indentedSyntax: false
                                 },
                                 additionalData: "$primaryBackground: " + primaryBackground + '; ' +
->>>>>>> Upgrade sass-loader; Closes #1235
                                       "$transitionBackground: " + transitionBackground + "; " +
                                       "$secondaryBackground: " + secondaryBackground + ";"
                             }