diff --git a/src/libCom/calc/calcPerform.c b/src/libCom/calc/calcPerform.c
index 911bdf11a..085831f7f 100644
--- a/src/libCom/calc/calcPerform.c
+++ b/src/libCom/calc/calcPerform.c
@@ -122,12 +122,8 @@ static double	local_random();
 #define PI 3.141592654
 #endif
 
-<<<<<<< calcPerform.c
 epicsShareFunc long epicsShareAPI 
 	calcPerform(double *parg, double *presult, char *post)
-=======
-long calcPerform( double *parg, double *presult, char  *post)
->>>>>>> 1.23
 {
 	double *pstacktop;	/* stack of values	*/
 	double		stack[80];
diff --git a/src/libCom/calcPerform.c b/src/libCom/calcPerform.c
index 911bdf11a..085831f7f 100644
--- a/src/libCom/calcPerform.c
+++ b/src/libCom/calcPerform.c
@@ -122,12 +122,8 @@ static double	local_random();
 #define PI 3.141592654
 #endif
 
-<<<<<<< calcPerform.c
 epicsShareFunc long epicsShareAPI 
 	calcPerform(double *parg, double *presult, char *post)
-=======
-long calcPerform( double *parg, double *presult, char  *post)
->>>>>>> 1.23
 {
 	double *pstacktop;	/* stack of values	*/
 	double		stack[80];