diff --git a/staticaddr/deposit/sql_store.go b/staticaddr/deposit/sql_store.go
index a35dc64..bdd3e4e 100644
--- a/staticaddr/deposit/sql_store.go
+++ b/staticaddr/deposit/sql_store.go
@@ -207,18 +207,11 @@ func (s *SqlStore) toDeposit(row sqlc.Deposit,
 			Hash:  *txHash,
 			Index: uint32(row.OutIndex),
 		},
-<<<<<<< HEAD
-		Value:                btcutil.Amount(row.Amount),
-		ConfirmationHeight:   row.ConfirmationHeight,
-		TimeOutSweepPkScript: row.TimeoutSweepPkScript,
-		ExpirySweepTxid:      expirySweepTxid,
-=======
 		Value:                  btcutil.Amount(row.Amount),
 		ConfirmationHeight:     row.ConfirmationHeight,
 		TimeOutSweepPkScript:   row.TimeoutSweepPkScript,
-		ExpirySweepTxid:        *expirySweepTxid,
+		ExpirySweepTxid:        expirySweepTxid,
 		WithdrawalSweepAddress: row.WithdrawalSweepAddress.String,
->>>>>>> bfb8cdb (add all in one commit for the moment)
 	}, nil
 }