diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90
index 6caea7d49..e5c609f5c 100644
--- a/lib/77bit/packjt77.f90
+++ b/lib/77bit/packjt77.f90
@@ -1156,7 +1156,6 @@ subroutine unpacktext77(c71,c13)
   return
 end subroutine unpacktext77
 
-<<<<<<< HEAD
 subroutine mp_short_ops(w,u)
   character*1 w(*),u(*)
   integer i,ireg,j,n,ir,iv,ii1,ii2
@@ -1221,6 +1220,5 @@ subroutine add_call_to_recent_calls(callsign)
 
   return
 end subroutine add_call_to_recent_calls
->>>>>>> d66724f6e9dd8fd8f1340aec9e5c0ebf45a681ac
 
 end module packjt77