Clean up messy merge

library/controllers/index-db-controller.js

@@ -50,18 +50,9 @@ module.exports = class IndexDbController extends EventEmitter {
   get (key) {
     return this.requestObjectStore(key)
     .then((dataObject)=> {
-      return new Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => {
         const getRequest = dataObject.get(key)
-        getRequest.onsuccess = (event) => {
+        getRequest.onsuccess = (event) => resolve(event.currentTarget.result)
-          const serialized = event.currentTarget.result
-          try {
-            console.log('serialized:',serialized)
-            const state = serialized ? JSON.parse(serialized) : {}
-            resolve(state)
-          } catch (err) {
-            reject(err)
-          }
-        }
         getRequest.onerror = (event) => reject(event)
       })
     })