diff --git a/packages/webapp/webpack.common.js b/packages/webapp/webpack.common.js
index f182dcca..e8e66143 100644
--- a/packages/webapp/webpack.common.js
+++ b/packages/webapp/webpack.common.js
@@ -38,10 +38,7 @@ module.exports = {
   },
   optimization: {
     usedExports: true,
-<<<<<<< HEAD
-=======
     chunkIds: 'named',
->>>>>>> feature/lazy_load
     splitChunks: {
       cacheGroups: {
         vendors: {