diff --git a/library/bignum.c b/library/bignum.c
index 975b6f8..4fe841c 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -889,7 +889,7 @@
 {
     int ret;
     size_t i, j;
-    mpi_uint *o, *p, c, tmp;
+    t_uint *o, *p, c, tmp;
 
     if( X == B )
     {
@@ -934,14 +934,6 @@
     }
 
 cleanup:
-<<<<<<< HEAD
-    if( &TB == B ) 
-    {
-        mpi_free( &TB );
-    }
-=======
->>>>>>> 6c9226809370... Improved on the previous fix and added a test case to cover both types
-
     return( ret );
 }