diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 687dbdae1..1af1f14b9 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -178,13 +178,9 @@ handle_refund_finished (void *cls,
     {
       ep = &exchange_pub;
       es = &exchange_sig;
-<<<<<<< HEAD
       TALER_amount_ntoh (&ra,
                          &rh->depconf.refund_fee);
       rf = &ra;
-=======
-      rf = &rh->depconf.refund_fee;
->>>>>>> return fee as well
     }
     break;
   case MHD_HTTP_BAD_REQUEST: