diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig
index aacccbbda..f16269dc9 100755
--- a/drivers/block/zram/Kconfig
+++ b/drivers/block/zram/Kconfig
@@ -2,7 +2,11 @@
 config ZRAM
 	tristate "Compressed RAM block device support"
 	depends on BLOCK && SYSFS && ZSMALLOC && CRYPTO
+<<<<<<< HEAD
 	select CRYPTO_ZSTD
+=======
+	select CRYPTO_LZ4
+>>>>>>> 3413b95770db (zram: Set default compressor to lz4)
 	help
 	  Creates virtual block devices called /dev/zramX (X = 0, 1, ...).
 	  Pages written to these disks are compressed and stored in memory
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index d68dee1f2..2b07ad0d1 100755
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -59,7 +59,7 @@ static DEFINE_IDR(zram_index_idr);
 static DEFINE_MUTEX(zram_index_mutex);
 
 static int zram_major;
-static const char *default_compressor = "zstd";
+static const char *default_compressor = "lz4"
 
 static bool is_lzorle;
 #ifdef CONFIG_ZRAM_LRU_WRITEBACK