diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 75ca325d0..84b5d1b95 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2273,6 +2273,10 @@ int64_t CWalletTx::GetTxTime() const
     return n ? n : nTimeReceived;
 }
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> origin/dev
 // GetAmounts will determine the transparent debits and credits for a given wallet tx.
 void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
                            list<COutputEntry>& listSent, CAmount& nFee, string& strSentAccount, const isminefilter& filter) const