diff --git a/app/styles/containers.less b/app/styles/containers.less
index 37b7000149..a2719b89aa 100644
--- a/app/styles/containers.less
+++ b/app/styles/containers.less
@@ -84,44 +84,6 @@
             padding: 4px 5px;
 
             &.active {
-<<<<<<< HEAD
-              background: @brand-primary;
-              li {
-                .name {
-                  color: white;
-                }
-                .image {
-                  color: white;
-                  opacity: 0.9;
-                }
-              }
-              color: white;
-              border-bottom: none;
-              border-radius: 40px;
-              .state-running {
-                .at2x('running-white.png', 20px, 20px);
-                overflow: hidden;
-                // -webkit-mask-image: -webkit-radial-gradient(circle, white, black);
-
-                .runningwave {
-                  position: absolute;
-                  width: 40px;
-                  height: 20px;
-                  left: -20px;
-                  .at2x('runningwave-white.png', 20px, 20px);
-                  // background-repeat: repeat;
-                  -webkit-animation-name: translatewave;
-                  -webkit-animation-duration: 8.0s;
-                  -webkit-animation-iteration-count: infinite;
-                  -webkit-animation-timing-function: linear;
-                }
-              }
-              .state-paused {
-                .at2x('wavy-white.png', 20px, 20px);
-              }
-              .state-stopped {
-                .at2x('still-white.png', 20px, 20px);
-=======
               li {
                 border-bottom: none;
                 border-radius: 40px;
@@ -152,7 +114,6 @@
                     .at2x('downloading-arrow-white.png', 20px, 20px);
                   }
                 }
->>>>>>> master
               }
             }
 
diff --git a/package.json b/package.json
index 52e6f7c3f8..757d5c0888 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "minimist": "^1.1.0",
     "moment": "2.8.1",
     "node-uuid": "1.4.1",
+    "object-assign": "^2.0.0",
     "open": "0.0.5",
     "react": "^0.12.2",
     "react-bootstrap": "^0.13.2",