diff --git a/src/drv/drvEpvxi.c b/src/drv/drvEpvxi.c
index ab7ff1d8f..ed7c8d100 100644
--- a/src/drv/drvEpvxi.c
+++ b/src/drv/drvEpvxi.c
@@ -138,11 +138,7 @@
  *
  */
 
-<<<<<<< drvEpvxi.c
-static char *sccsId = "@(#)drvEpvxi.c	1.27\t9/9/93";
-=======
 static char *sccsId = "$Id$\t$Date$";
->>>>>>> 1.28
 
 #include <vxWorks.h>
 #include <vme.h>