diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index 25b2c01c74..1c794be37a 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -579,5 +579,13 @@ function domTerminalFeatures (self, scopedCommands) {
 }
 
 function blockify (el) { return yo`<div class=${css.block}>${el}</div>` }
+<<<<<<< HEAD
+=======
+// PENDING TX
+function updatePendingTxs (udapp, el) {
+  var count = Object.keys(udapp.pendingTransactions()).length
+  el.innerText = count
+}
+>>>>>>> fix terminal api
 
 module.exports = Terminal