diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig
index f16269dc9..a2a707390 100755
--- a/drivers/block/zram/Kconfig
+++ b/drivers/block/zram/Kconfig
@@ -2,11 +2,7 @@
 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