diff --git a/v1-com-officielle/src/indieComponents/VideoPannel.vue b/v1-com-officielle/src/indieComponents/VideoPannel.vue
index d03a89d..7813b65 100644
--- a/v1-com-officielle/src/indieComponents/VideoPannel.vue
+++ b/v1-com-officielle/src/indieComponents/VideoPannel.vue
@@ -21,12 +21,8 @@
         </button>
       </div>
       <div class="windowContent" id="visualizerContent">
-<<<<<<< HEAD
         <video controls id="displayedImgStyle" :src="selectedVideo.src" :type="selectedVideo.format">
         </video>
-=======
-        <video controls id="displayedImgStyle" :src="selectedVideo.src"></video>
->>>>>>> 13df9c06016b4c751d7817b8f3b1108bf669a990
         <div class="reactBar">
           <p class="reactStatStyle">{{selectedVideo.like}}</p>
           <button data-tooltip="j'aime bien" type="button" class="iconBtnStyle" :class="{reactedStyle: selectedVideo.isLiked}" @mousedown.capture="likeImg" @touchstart.capture="likeImg">