merge conflict

src/lib/RemoteFeed.vue

@@ -1,12 +1,10 @@
 <template>
-    <div class="vid_main" @mouseleave="showaction = false"    @mouseover="showaction = true"
-    >
+    <div class="vid_main" @mouseleave="showaction = false"    @mouseover="showaction = true">
         <video ref="feed_video" width="100%" height="100%" autoplay playsinline/>
         <div class="info">{{ bitrate }}</div>
         <div class="infoSlow">Slow Connection</div>
-        <div class="actions"  v-show="showaction">
         <div class="infoName">{{ remoteStream.display }}</div>
-        <div class="actions">
+        <div class="actions" v-show="showaction">
             <v-slider
                     v-model="volume"
                     :min="0"