3 files changed, 4 insertions, 41 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 01ec0d8b..067b00fc 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -196,22 +196,14 @@ async function loadStateFromPersistence () {
       // we were able to recover (though it might be old)
       versionedData = diskStoreState
       const vaultStructure = getObjStructure(versionedData)
-<<<<<<< HEAD
-      sentry.captureMessage('MetaMask - Empty vault found - recovered from diskStore', {
-=======
-      raven.captureMessage('DekuSan - Empty vault found - recovered from diskStore', {
->>>>>>> Complete onboarding flow
+      sentry.captureMessage('DekuSan - Empty vault found - recovered from diskStore', {
         // "extra" key is required by Sentry
         extra: { vaultStructure },
       })
     } else {
       // unable to recover, clear state
       versionedData = migrator.generateInitialState(firstTimeState)
-<<<<<<< HEAD
-      sentry.captureMessage('MetaMask - Empty vault found - unable to recover')
-=======
-      raven.captureMessage('DekuSan - Empty vault found - unable to recover')
->>>>>>> Complete onboarding flow
+      sentry.captureMessage('DekuSan - Empty vault found - unable to recover')
     }
   }
 
@@ -364,15 +356,11 @@ function setupController (initState, initLangCode) {
     const processName = remotePort.name
     const isDekuSanInternalProcess = metamaskInternalProcessHash[processName]
 
-<<<<<<< HEAD
     if (metamaskBlacklistedPorts.includes(remotePort.name)) {
       return false
     }
 
-    if (isMetaMaskInternalProcess) {
-=======
     if (isDekuSanInternalProcess) {
->>>>>>> Complete onboarding flow
       const portStream = new PortStream(remotePort)
       // communication with popup
       controller.isClientOpen = true
diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js
index 9d38278e..5017b687 100644
--- a/app/scripts/controllers/token-rates.js
+++ b/app/scripts/controllers/token-rates.js
@@ -47,8 +47,6 @@ class TokenRatesController {
   }
 
   /**
-<<<<<<< HEAD
-=======
    * Fetches a token exchange rate by address
    *
    * @param {String} address - Token contract address
@@ -59,13 +57,12 @@ class TokenRatesController {
       const json = await response.json()
       return json && json.length ? json[0].averagePrice : 0
     } catch (error) {
-      warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error)
+      log.warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error)
       return 0
     }
   }
 
   /**
->>>>>>> Complete onboarding flow
    * @type {Number}
    */
   set interval (interval) {
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index 3d8c0b9a..d749321e 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -28,7 +28,7 @@ async function start () {
     const state = window.getCleanAppState()
     // remove unnecessary data
     delete state.localeMessages
-    delete state.metamask.recentBlocks
+    delete state.dekusan.recentBlocks
     // return state to be added to request
     return state
   }
@@ -46,29 +46,7 @@ async function start () {
   const container = document.getElementById('app-content')
   startPopup({ container, connectionStream }, (err, store) => {
     if (err) return displayCriticalError(err)
-<<<<<<< HEAD
-
-    const state = store.getState()
-    let betaUIState = Boolean(state.featureFlags && state.featureFlags.betaUI)
-    const useBetaCss = getShouldUseNewUi(state)
-
-    let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
-    let deleteInjectedCss = injectCss(css)
-    let newBetaUIState
-
-    store.subscribe(() => {
-      const state = store.getState()
-      newBetaUIState = state.metamask.featureFlags.betaUI
-      if (newBetaUIState !== betaUIState) {
-        deleteInjectedCss()
-        betaUIState = newBetaUIState
-        css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
-        deleteInjectedCss = injectCss(css)
-      }
-    })
-=======
     injectCss(NewMetaMaskUiCss())
->>>>>>> Complete onboarding flow
   })