diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 6f216b24d..57aeebdfe 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -495,7 +495,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to
             continue;
         {
 #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE
-            if ( height > 236000 )
+            if ( pax->height > 236000 )
             {
                 if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height )
                     pax->validated = pax->komodoshis;
diff --git a/src/main.cpp b/src/main.cpp
index 31ee26c8e..8f3fdfddd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -875,7 +875,11 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state,
             {
                 static uint32_t counter;
                 if ( counter++ < 100 )
+<<<<<<< Updated upstream
                     printf("MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j);
+=======
+                    fprintf(stderr,"MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j);
+>>>>>>> Stashed changes
                 return(false);
             }
         }