diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 5430f578..f9a21b86 100755
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -40,14 +40,11 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
-<<<<<<< HEAD
-=======
 
 #ifdef CONFIG_SWAP
 #include <linux/fs.h>
 #include <linux/swap.h>
 #endif
->>>>>>> ics_HWA
 
 static uint32_t lowmem_debug_level = 2;
 static int lowmem_adj[6] = {