Fix merge conflicts.

1 files changed, 2 insertions, 0 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index cf865f23f..d8519def7 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -65,6 +65,7 @@ function mapStateToProps (state) {
 App.prototype.render = function () {
   var props = this.props
   const { isLoading, loadingMessage, transForward } = props
+  log.debug('Main ui render function')
 
   return (
 
@@ -352,6 +353,7 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
 }
 
 App.prototype.renderPrimary = function () {
+  log.debug('rendering primary')
   var props = this.props
 
   // notices