diff --git a/src/app.js b/src/app.js
index bfef9b84b4..03bc0ba832 100644
--- a/src/app.js
+++ b/src/app.js
@@ -46,7 +46,10 @@ var BasicReadOnlyExplorer = require('./app/files/basicReadOnlyExplorer')
 var NotPersistedExplorer = require('./app/files/NotPersistedExplorer')
 var toolTip = require('./app/ui/tooltip')
 var CommandInterpreter = require('./lib/cmdInterpreter')
+<<<<<<< HEAD
 var TransactionReceiptResolver = require('./transactionReceiptResolver')
+=======
+>>>>>>> refactor rhpp
 
 var styleGuide = require('./app/ui/styles-guide/theme-chooser')
 var styles = styleGuide.chooser()