diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix
index 9d2d2fb20..dfc448982 100644
--- a/src/libCom/Makefile.Unix
+++ b/src/libCom/Makefile.Unix
@@ -4,25 +4,6 @@ include $(EPICS)/config/CONFIG_BASE
 
 USR_CFLAGS = -D_NO_PROTO
 
-<<<<<<< Makefile.Unix
-SRCS.c = \
-	../bucketLib.c ../calcPerform.c ../cvtFast.c \
-	../ellLib.c ../envSubr.c ../errMtst.c ../errSymLib.c \
-	../fdmgr.c  ../freeListLib.c \
-	../gpHashLib.c ../memDebugLib.c \
-	../nextFieldSubr.c ../postfix.c \
-	../tsSubr.c errSymTbl.c ../errInc.c \
-	../realpath.c  ../errPrintfUNIX.c \
-	../assertUNIX.c
-
-LIBOBJS = \
-	tsSubr.o bucketLib.o calcPerform.o\
-	cvtFast.o ellLib.o\
-	envSubr.o errMtst.o errSymLib.o errSymTbl.o fdmgr.o \
-	freeListLib.o gpHashLib.o \
-	memDebugLib.o  nextFieldSubr.o postfix.o \
-	realpath.o  errPrintfUNIX.o assertUNIX.o
-=======
 SRCS.c += ../bucketLib.c
 SRCS.c += ../calcPerform.c
 SRCS.c += ../cvtFast.c
@@ -41,6 +22,7 @@ SRCS.c += ../nextFieldSubr.c
 SRCS.c += ../postfix.c
 SRCS.c += ../realpath.c
 SRCS.c += ../tsSubr.c
+SRCS.c += ../assertUNIX.c
 
 LIBOBJS += bucketLib.o
 LIBOBJS += calcPerform.o
@@ -59,7 +41,7 @@ LIBOBJS += nextFieldSubr.o
 LIBOBJS += postfix.o
 LIBOBJS += realpath.o
 LIBOBJS += tsSubr.o
->>>>>>> 1.22
+LIBOBJS += assertUNIX.o
 
 LIBNAME = libCom.a
 
diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx
index 853adf230..1a43836b9 100644
--- a/src/libCom/Makefile.Vx
+++ b/src/libCom/Makefile.Vx
@@ -19,6 +19,7 @@ SRCS.c += ../pal.c
 SRCS.c += ../paldef.c
 SRCS.c += errSymTbl.c
 SRCS.c += ../errPrintfVX.c
+SRCS.c += ../assertVX.c
 
 OBJS += calcPerform.o
 OBJS += cvtBpt.o
@@ -36,6 +37,7 @@ OBJS += freeListLib.o
 OBJS += pal.o
 OBJS += paldef.o
 OBJS += errPrintfVX.o
+OBJS += assertVX.o
 
 PROD = libCom