diff --git a/src/renderer/index.js b/src/renderer/index.js
index 791551dc..000f4043 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -343,15 +343,9 @@ const app = new Vue({
 
             // load last played track
             try {
-<<<<<<< HEAD
                let lastItem = window.localStorage.getItem("currentTrack")
                let time = window.localStorage.getItem("currentTime")
                let queue = window.localStorage.getItem("currentQueue")
-=======
-               lastItem = window.localStorage.getItem("currentTrack")
-               time = window.localStorage.getItem("currentTime")
-               queue = window.localStorage.getItem("currentQueue")
->>>>>>> 7322c71... save last played track, time and queue
                 if (lastItem != null) {
                     lastItem = JSON.parse(lastItem)
                     var kind = lastItem.attributes.playParams.kind;
@@ -371,15 +365,9 @@ const app = new Vue({
                                         let ids = queue.map ( e => (e.playParams ? e.playParams.id : (e.attributes.playParams ? e.attributes.playParams.id : '') ))
                                         if (ids.length > 0) {
                                             for (id of ids){
-<<<<<<< HEAD
                                                 try{
                                                 app.mk.playLater({songs: [id] })
                                                 } catch (err){}
-=======
-                                            try{
-                                            app.mk.playLater({songs: [id] })
-                                            } catch (err){}
->>>>>>> 7322c71... save last played track, time and queue
                                             }
                                         }
                                 }
@@ -387,11 +375,7 @@ const app = new Vue({
                             
                         })
 
-<<<<<<< HEAD
                     })},1500)
-=======
-                    })},1000)
->>>>>>> 7322c71... save last played track, time and queue
 
                 }