diff --git a/drivers/staging/ramzswap/xvmalloc.c b/drivers/staging/ramzswap/xvmalloc.c
index 7cdfcbdc5f2..ada45f4e4bd 100644
--- a/drivers/staging/ramzswap/xvmalloc.c
+++ b/drivers/staging/ramzswap/xvmalloc.c
@@ -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.