defconfig: how do I keep fucking up so bad?

arch/arm/configs/cm_shinano_aries_defconfig

@@ -623,63 +623,40 @@ CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
 CONFIG_CRYPTO_DEV_QCE=y
 CONFIG_CRYPTO_DEV_QCEDEV=y
-<<<<<<< HEAD
-=======
 
 # 
 # CPU/GPU/board tweaks
 # 
 CONFIG_CPU_VOLTAGE_TABLE=y
-# Snake charmer
 CONFIG_POWERSUSPEND=y
-CONFIG_MSM_CPUFREQ_LIMITER=y
 CONFIG_MSM_CPU_FREQ_SET_MIN_MAX=y
 CONFIG_MSM_CPU_FREQ_MAX=2457600
-CONFIG_MSM_CPU_FREQ_MIN=300000
+CONFIG_MSM_CPU_FREQ_MIN=268000
 CONFIG_IKCONFIG_PROC=y
-CONFIG_CPU_FREQ_GOV_INTELLIACTIVE=y
+CONFIG_ADRENO_IDLER=y
+CONFIG_INTELLI_THERMAL_V2=y
+CONFIG_INTELLI_PLUG=y
 
 # Simple GPU governor is broken, avoid for now
 CONFIG_MSM_KGSL_SIMPLE_GOV=n
 
 # 
 # Memory tweaks
 # 
-CONFIG_KSM=y
-CONFIG_ZSMALLOC_NEW=y
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=n
-CONFIG_ZRAM_DEBUG=n
 CONFIG_DYNAMIC_FSYNC=y
 CONFIG_AIO=y
-CONFIG_LZ4_COMPRESS=y
-# CONFIG LZ4HC_COMPRESS=y
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_LZ4HC=y
-CONFIG_CRYPTO_LZO=y
-CONFIG_KERNEL_LZ4=y
 CONFIG_HAS_MACH_MEMUTILS=y
-# Swap is broken, avoid for now
-CONFIG_SWAP=n
-CONFIG_FRONTSWAP=n
-CONFIG_ZSWAP=n
-# F2FS is broken, avoid for now
-CONFIG_F2FS_FS=n
-CONFIG_F2FS_STAT_FS=n
-CONFIG_F2FS_FS_XATTR=n
-CONFIG_F2FS_FS_POSIX_ACL=n
 
 #
 # Misc tweaks
 # 
-CONFIG_SOUND_CONTROL_HAX_3_GPL=y
+# CONFIG_SOUND_CONTROL_HAX_3_GPL=y
 CONFIG_LCD_KCAL=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_HARDBOOT=y
 CONFIG_ATAGS_PROC=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_PROC_FS=y
 CONFIG_ANDROID_PERSISTENT_RAM=y
+CONFIG_QUICK_WAKEUP=y
 
->>>>>>> a369616... Test for fixing kexec