diff --git a/drivers/staging/ramzswap/xvmalloc_int.h b/drivers/staging/ramzswap/xvmalloc_int.h
index 0695f659f2d..e23ed5c8b8e 100644
--- a/drivers/staging/ramzswap/xvmalloc_int.h
+++ b/drivers/staging/ramzswap/xvmalloc_int.h
@@ -1,11 +1,7 @@
 /*
  * xvmalloc memory allocator
  *
-<<<<<<< HEAD
  * Copyright (C) 2008, 2009, 2010  Nitin Gupta
-=======
- * Copyright (C) 2008, 2009  Nitin Gupta
->>>>>>> 644bf7b... Staging: xvmalloc memory allocator
  *
  * This code is released using a dual license strategy: BSD/GPL
  * You can choose the licence that better fits your requirements.
@@ -66,11 +62,7 @@ struct link_free {
 
 struct block_header {
 	union {
-<<<<<<< HEAD
 		/* This common header must be XV_ALIGN bytes */
-=======
-		/* This common header must be ALIGN bytes */
->>>>>>> 644bf7b... Staging: xvmalloc memory allocator
 		u8 common[XV_ALIGN];
 		struct {
 			u16 size;