+									<?php if($APP->registry->get('Product/showVideoBeforeMainImageOnProductDetailsPage')){ ?>
+										<?php $iCount = 0; ?>
+											<?php if(count($productVideo)){ ?>
+													<?php foreach($productVideo as $video){ ?>
+														<?php $iCount++; ?>
+														<li>
+														<div class="tab-pane" id="videos" style="position: relative;padding-bottom: 56.25%;margin-top:20px;padding-top: 25px;height: 0;">
+															<div class="video-h clearfix">
+															<?php if($video['type'] == 'youtube'){?>
+																	<iframe style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;" width="" height="" src="https://www.youtube.com/embed/<?php echo $video['link']; ?>?modestbranding=1&showinfo=0&fs=0" allowfullscreen="" frameborder='0'></iframe>
+															<?php } elseif($video['type'] == 'vimeo') {?>
+																	<iframe style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;" width="" height="" src="https://player.vimeo.com/video/<?php echo $video['link']; ?>" allowfullscreen="" frameborder='0'></iframe>
+															<?php }?>
+															</div>
+													<?php } ?>
+														</div>
+											<?php } ?>
+											<?php foreach($images as $key=>$i){ ?>
+													<li><a href="<?php echo $i['original']?>" class="prod-gallery __retargetingImageThumbSelector" rel="prod-gallery">
+														<img id="img_<?php echo $iCount++?>" data-zoom-image="<?php echo $i['original'];?>" src="<?php echo $i['large'];?>" data-id="<?php echo $product->id; ?>" alt="<?php echo $product->name; ?>" title="<?php echo $product->name. '-big'; ?>"  class="standard-zoom img-responsive swaped-image zoom pinchzoom" data-src="<?php echo $i['large']; ?>" data-full-image="<?php echo $i['original']; ?>">
+													</a></li>
+											<?php }?>
+									<?php } else { ?>
 									<?php foreach($images as $key=>$i){ ?>
+<<<<<<< destination:51e65c9b87bbfd4e2993db34011975a3b5732d0a
 										<li><a href="<?php echo $i['original']?>" class="prod-gallery __retargetingImageThumbSelector" rel="prod-gallery">
 											<img id="img_<?php echo $key?>" data-zoom-image="<?php echo $i['original'];?>" src="<?php echo $i['large'];?>" data-id="<?php echo $product->id; ?>" alt="<?php echo $product->image_alt_text ? : $product->name; ?>" title="<?php echo $product->image_alt_text ? : $product->name. '-big'; ?>"  class="standard-zoom img-responsive swaped-image zoom pinchzoom" data-src="<?php echo $i['large']; ?>" data-full-image="<?php echo $i['original']; ?>">
 										</a></li>
+=======
+												<li><a href="<?php echo $i['original']?>" class="prod-gallery __retargetingImageThumbSelector" rel="prod-gallery">
+													<img id="img_<?php echo $key?>" data-zoom-image="<?php echo $i['original'];?>" src="<?php echo $i['large'];?>" data-id="<?php echo $product->id; ?>" alt="<?php echo $product->name; ?>" title="<?php echo $product->name. '-big'; ?>"  class="standard-zoom img-responsive swaped-image zoom pinchzoom" data-src="<?php echo $i['large']; ?>" data-full-image="<?php echo $i['original']; ?>">
+												</a></li>
+											<?php }?>
+>>>>>>> source:6339bd05be5a862ad4c0e423be52a4a3b024adff
 									<?php } ?>