diff --git a/upload/styles/cb_28/layout/watch_video.html b/upload/styles/cb_28/layout/watch_video.html
index 5589938f..4bac028e 100644
--- a/upload/styles/cb_28/layout/watch_video.html
+++ b/upload/styles/cb_28/layout/watch_video.html
@@ -30,22 +30,22 @@
 					<div class="user-likes-sub clearfix">
 						<div class="clearfix like-rating col-lg-6 col-md-6 col-sm-6 col-xs-12" id="rating_container">
 							{if $vdo.allow_rating != 'no'}
-								{show_video_rating  rating=$vdo.rating ratings=$vdo.rated_by total='10' id=$vdo.videoid type=video}
+							{show_video_rating  rating=$vdo.rating ratings=$vdo.rated_by total='10' id=$vdo.videoid type=video}
 							{/if}
 						</div>
 						<div class="clearfix subscribe-col col-lg-6 col-md-6 col-sm-6 col-xs-12">
 							{if $video.userid != userid()}
-								<a id="subscribeUser" class="btn btn-subscribe btn-primary" href="javascript:void(0)">
-									<span>{lang code='subscribe'}</span>
-								</a>
+							<a id="subscribeUser" class="btn btn-subscribe btn-primary" href="javascript:void(0)">
+								<span>{lang code='subscribe'}</span>
+							</a>
 							{/if}
 							{if $Cbucket->configs.video_download==1 && $cbvid->downloadable($vdo)}
-								<div class="dropdown">
-									<button class="btn btn-success dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
+							<div class="dropdown">
+								<button class="btn btn-success dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
 									{lang code='download'}
-										<span class="caret"></span>
-									</button>
-									<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
+									<span class="caret"></span>
+								</button>
+								<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
 									{$files = get_video_files($vdo,true,true)}
 									{foreach $files as $file}
 									{$quality = explode('-',$file)}
@@ -54,14 +54,79 @@
 									{$file_quality = $quality.0}
 									<li role="presentation">
 										<a role="menuitem" tabindex="-1" href="{$file}"  download>
-										<span class="glyphicon glyphicon-download-alt"></span> {$file_quality}</a>
-										
-									</li>
-									{/foreach}
+											<span class="glyphicon glyphicon-download-alt"></span> {$file_quality}</a>
+											
+										</li>
+										{/foreach}
 									</ul>
 								</div>
-							{/if}
+								{/if}
+							</div>
 						</div>
+<<<<<<< .mine
+					</header>
+					<div id="messageFav" class="alert alert-info marginTop" style="display:none"></div>
+					<div class="view-tabs clearfix">
+						<ul class="clearfix nav nav-tabs">
+							<li class="active">
+								<a href="#cb-item-info" data-toggle="tab"><span class="icon-info"></span>{lang code='info'}</a>
+							</li>
+							<li>
+								<a href="#cb-item-share" data-toggle="tab"><span class="icon-share"></span>{lang code='share_embed'}</a>
+							</li>
+							<li>
+								<a href="#cb-item-addto" data-toggle="tab"><span class="icon-plusrounded"></span>{lang code='add_to'}</a>
+							</li>
+							<li>
+								<a href="#cb-item-report" data-toggle="tab"><span class="icon-flag"></span>{lang code='report_this'}</a>
+							</li>
+						</ul>
+						<div class="tab-content clearfix">
+							<div class="tab-pane fade in clearfix active" id="cb-item-info">
+								<div class="clearfix watch-vid-details">
+									<p style="white-space: pre-line;">{AutoLinkUrls($video.description|unescape:"html")}</p>
+									<ul class="clearfix desc-list">
+										<li><strong>{lang code='category'}</strong>:&nbsp;{$vdo.category|categories:video}</li>
+										<li><strong>{lang code='duration'}</strong>:&nbsp;{if $video.duration>1}{$video.duration|SetTime}{else}00:00{/if}</li>
+										<li><strong>{lang code='date'}</strong>:&nbsp; {$video.date_added|nicetime}</li>
+										<li>
+											<strong class="pull-left">{lang('tags')}:&nbsp;&nbsp;</strong>
+											<span class="pull-left">{$vdo.tags|tags:videos}</span>
+										</li>
+									</ul>
+								</div>
+							</div>
+
+							<div class="tab-pane fade in clearfix" id="cb-item-share">
+								<ul class="social-share">
+||||||| .r4769
+					</div>
+				</header>
+				<div id="messageFav" class="alert alert-info marginTop" style="display:none"></div>
+				<div class="view-tabs clearfix">
+					<ul class="clearfix nav nav-tabs">
+						<li class="active">
+							<a href="#cb-item-info" data-toggle="tab"><span class="icon-info"></span>{lang code='info'}</a>
+						</li>
+						<li>
+							<a href="#cb-item-share" data-toggle="tab"><span class="icon-share"></span>{lang code='share_embed'}</a>
+						</li>
+						<li>
+							<a href="#cb-item-addto" data-toggle="tab"><span class="icon-plusrounded"></span>{lang code='add_to'}</a>
+						</li>
+						<li>
+							<a href="#cb-item-report" data-toggle="tab"><span class="icon-flag"></span>{lang code='report_this'}</a>
+						</li>
+					</ul>
+					<div class="tab-content clearfix">
+						<div class="tab-pane fade in clearfix active" id="cb-item-info">
+							<div class="clearfix watch-vid-details">
+								<p>{AutoLinkUrls($video.description|unescape:"html")}</p>
+								<ul class="clearfix desc-list">
+									<li><strong>{lang code='category'}</strong>:&nbsp;{$vdo.category|categories:video}</li>
+									<li><strong>{lang code='duration'}</strong>:&nbsp;{if $video.duration>1}{$video.duration|SetTime}{else}00:00{/if}</li>
+									<li><strong>{lang code='date'}</strong>:&nbsp; {$video.date_added|nicetime}</li>
+=======
 					</div>
 				</header>
 				<div id="messageFav" class="alert alert-info marginTop" style="display:none"></div>
@@ -88,247 +153,238 @@
 									<li><strong>{lang code='category'}</strong>:&nbsp;{$vdo.category|categories:video}</li>
 									<li><strong>{lang code='duration'}</strong>:&nbsp;{if $video.duration>1}{$video.duration|SetTime}{else}00:00{/if}</li>
 									<li><strong>{lang code='date'}</strong>:&nbsp; {$video.date_added|nicetime}</li>
+>>>>>>> .r4775
 									<li>
-										<strong class="pull-left">{lang('tags')}:&nbsp;&nbsp;</strong>
-										<span class="pull-left">{$vdo.tags|tags:videos}</span>
+										<a href="http://www.facebook.com/sharer/sharer.php?s=100&p[url]={videoLink($video)|urlencode}&p[images][0]={get_thumb vdetails=$video}&p[title]={$video.title|title|urlencode}&p[summary]={$video.description|description|urlencode}" target="_blank" class="btn-fb icon-facebook">
+											<span>Facebook</span>
+										</a>
 									</li>
+									<li>
+										<a href="https://twitter.com/share" target="_blank" class="btn-tw icon-twitter">
+											<span>Twitter</span>
+										</a>
+									</li>
+									<li>
+										<a href="https://plus.google.com/share?url={urlencode(videolink($video))}" target="_blank" class="btn-gplus icon-gplus">
+											<span>Google Plus</span>
+										</a>
+									</li>
+								</ul>
+								{show_share_form id=$vdo.videoid type=video}
+							</div>
+							<div class="tab-pane fade in clearfix custom-elements" id="cb-item-addto">
+								<div class="clearfix btn-fav">
+									<div id="video_action_result_cont"></div>
+									<a id="addfav" class="btn btn-block btn-primary" href="javascript:void(0)" onclick="_cb.add_to_favNew('video','{$vdo.videoid}');">{lang code='add_to_my_favorites'}</a>
+								</div>
+								<div class="clearfix">
+									{show_playlist_form id=$vdo.videoid type=video user=userid() }
+									{if userid()}
+									<div class="clearfix">
+										<div class="clearfix btn-holder text-right">
+											<a href="javascript:void(0)" onclick="$('#addCollectionCont').toggle()" class="btn btn-primary">+ {lang code='add_to_my_collection'}</a>
+										</div>
+										<div id="addCollectionCont" style="display:none">
+											{show_collection_form id=$vdo.videoid type=Video}
+										</div>
+									</div>
+									{/if}    
+								</div>
+							</div>
+							<div class="tab-pane fade in clearfix custom-elements" id="cb-item-report">
+								<h2>{lang code='report_video'}</h2>
+								{show_flag_form id=$vdo.videoid type=video}
+							</div>
+						</div>
+					</div>
+				</section>
+
+				<div class="clearfix comments-block" id="comments-block">
+					<div id="test1"></div>
+					<div id="reply" class="clearfix"> 
+						<div  class="addComment clearfix">
+							<h2 class="com_count" id="com_count">
+								{$vdo.comments_count} <span>{lang code='comments'} </span>
+							</h2>
+							{if $myquery->is_commentable($vdo,'v')}
+							{include file="$style_dir/blocks/comments/add_comment.html" id=$vdo.videoid type=v}
+							{else}
+							<div class="alert alert-warning">
+								{lang code='comm_disabled_for_vid'}
+							</div>
+							{/if}
+						</div>
+						
+						<div id="userCommentsList">
+							<div class="comments clearfix">
+								<ul id="comments-ul">
 								</ul>
 							</div>
 						</div>
-
-						<div class="tab-pane fade in clearfix" id="cb-item-share">
-							<ul class="social-share">
-								<li>
-									<a href="http://www.facebook.com/sharer/sharer.php?s=100&p[url]={videoLink($video)|urlencode}&p[images][0]={get_thumb vdetails=$video}&p[title]={$video.title|title|urlencode}&p[summary]={$video.description|description|urlencode}" target="_blank" class="btn-fb icon-facebook">
-										<span>Facebook</span>
-									</a>
-								</li>
-								<li>
-									<a href="https://twitter.com/share" target="_blank" class="btn-tw icon-twitter">
-										<span>Twitter</span>
-									</a>
-								</li>
-								<li>
-									<a href="https://plus.google.com/share?url={urlencode(videolink($video))}" target="_blank" class="btn-gplus icon-gplus">
-										<span>Google Plus</span>
-									</a>
-								</li>
-							</ul>
-							{show_share_form id=$vdo.videoid type=video}
-						</div>
-						<div class="tab-pane fade in clearfix custom-elements" id="cb-item-addto">
-							<div class="clearfix btn-fav">
-								<div id="video_action_result_cont"></div>
-								<a id="addfav" class="btn btn-block btn-primary" href="javascript:void(0)" onclick="_cb.add_to_favNew('video','{$vdo.videoid}');">{lang code='add_to_my_favorites'}</a>
-							</div>
-							<div class="clearfix">
-								{show_playlist_form id=$vdo.videoid type=video user=userid() }
-								{if userid()}
-								<div class="clearfix">
-									<div class="clearfix btn-holder text-right">
-										<a href="javascript:void(0)" onclick="$('#addCollectionCont').toggle()" class="btn btn-primary">+ {lang code='add_to_my_collection'}</a>
-									</div>
-									<div id="addCollectionCont" style="display:none">
-									{show_collection_form id=$vdo.videoid type=Video}
-									</div>
-								</div>
-								{/if}    
-							</div>
-						</div>
-						<div class="tab-pane fade in clearfix custom-elements" id="cb-item-report">
-							<h2>{lang code='report_video'}</h2>
-							{show_flag_form id=$vdo.videoid type=video}
-						</div>
-					</div>
-				</div>
-			</section>
-
-			<div class="clearfix comments-block" id="comments-block">
-				<div id="test1"></div>
-				<div id="reply" class="clearfix"> 
-					<div  class="addComment clearfix">
-						<h2 class="com_count" id="com_count">
-							{$vdo.comments_count} <span>{lang code='comments'} </span>
-						</h2>
-						{if $myquery->is_commentable($vdo,'v')}
-							{include file="$style_dir/blocks/comments/add_comment.html" id=$vdo.videoid type=v}
-						{else}
-						<div class="alert alert-warning">
-							{lang code='comm_disabled_for_vid'}
-						</div>
-						{/if}
-					</div>
-					
-					<div id="userCommentsList">
-						<div class="comments clearfix">
-    					<ul id="comments-ul">
-    					</ul>
-    				</div>
-					</div>
-					{if $vdo.comments_count > 10}
+						{if $vdo.comments_count > 10}
 						<div class="clearfix text-center">
 							<button class="btn btn-loadmore" id="load-more-comments" page="2">{lang code='load_more'}</button>
 						</div>
-					{/if}
+						{/if}
+					</div>
 				</div>
-			</div>
-		</section>
-		<aside id="sidebar">
-			<div class="box-ad ad">{AD place='ad_300x250'}</div>
+			</section>
+			<aside id="sidebar">
+				<div class="box-ad ad">{AD place='ad_300x250'}</div>
 
-			<h2>{if $smarty.get.play_list}Playlist Videos{elseif $relMode != 'ono'}Related Videos{else}Popular Videos{/if}</h2>
-			<div class="clearfix sidebar-items">
-			{if $smarty.get.play_list}
-				<div id="playlist_items">
-					{$cur_playlist = $smarty.get.play_list}
-					{$total_items = $cbvid->action->count_playlist_items($cur_playlist)}
-					{section name=plist loop=$items}
-					  {include file="$style_dir/blocks/manage/account_video.html" video=$items[plist] control="onWatch" pid=$playlist.playlist_id}
-					{/section}
-				</div>
-				{if $total_items > 10}
+				<h2>{if $smarty.get.play_list}Playlist Videos{elseif $relMode != 'ono'}Related Videos{else}Popular Videos{/if}</h2>
+				<div class="clearfix sidebar-items">
+					{if $smarty.get.play_list}
+					<div id="playlist_items">
+						{$cur_playlist = $smarty.get.play_list}
+						{$total_items = $cbvid->action->count_playlist_items($cur_playlist)}
+						{section name=plist loop=$items}
+						{include file="$style_dir/blocks/manage/account_video.html" video=$items[plist] control="onWatch" pid=$playlist.playlist_id}
+						{/section}
+					</div>
+					{if $total_items > 10}
 					<button class="btn btn-primary text-centre" id="playlist-pull" dataList={$cur_playlist} dataLimit="10" dataHit="2">Load More</button>
-				{/if}
-			{else}			    	
-				{if $videos}
+					{/if}
+					{else}			    	
+					{if $videos}
 					{foreach from=$videos item=pop_video}
-			
+					
 					{if $pop_video@iteration == 9}
-						{break}
+					{break}
 					{/if}
 					<div class="clearfix popular-video">
 						{include file="$style_dir/blocks/videos/video.html" display_type='popVideos_sidebar'}
 					</div>
 					{/foreach}
-			
-				{else}
+					
+					{else}
 					<div class="well well-info">No Videos Found !</div>
-				{/if}
-			{/if}
-			</div>
-		</aside>
+					{/if}
+					{/if}
+				</div>
+			</aside>
+		</div>
 	</div>
-</div>
 
-<script>
+	<script>
 
-	/*Cookie based comments backup start*/
-	var current_video = "{$video.videoid}",
-	cookieToSave = 'comment_data_u'+userid+"v"+current_video,
-	commentDataCheck = $.cookie(cookieToSave);
+		/*Cookie based comments backup start*/
+		var current_video = "{$video.videoid}",
+		cookieToSave = 'comment_data_u'+userid+"v"+current_video,
+		commentDataCheck = $.cookie(cookieToSave);
 
-	if (commentDataCheck !== null) {
-		$('#comment_box').val(commentDataCheck);
-	}
-	$('#comment_box').on('keyup', function() {
-	    var comment_data = $('#comment_box').val();
-	    $.cookie(cookieToSave, comment_data, { expires : 10, path : "/" });
-	});
-
-	$('#add_comment_button').on("click",function(){
-		$.cookie(cookieToSave, null, { path : "/" });
-	});
-	/*Cookie based comments backup end*/
-
-	var playlist_total = "{$total_items}";
-	$('#ShareUsers').on("keyup",function(){
-		var typed = $(this).val();
-		$.ajax({
-			url: baseurl+'/ajax.php',
-			type: 'post',
-			dataType: 'html',
-			data: {
-				"mode":'user_suggest',
-				"typed": typed
-			},
-			beforeSend: function() {
-			},
-
-			success: function(data) {
-				$('#suggested_users').html('');
-				var jsoned = $.parseJSON(data);
-				$( jsoned.matching_users ).each(function( index, element ) {
-					$('#suggested_users').append("<option label='"+element+"' value='"+element+"'>");
-			  	});
-			}
-		});
-	});
-
-	/*Playlist load more start*/
-	var playlist_total = "{$total_items}";
-	$('#playlist-pull').on("click",function(){
-		var __this = $(this);
-		loadHit = $(this).attr('dataHit');
-		loadLimit = $(this).attr('dataLimit');
-		playlist = $(this).attr('dataList');
-
-		$.ajax({
-			url: baseurl+'/ajax/watch.php',
-			type: 'post',
-			dataType: 'html',
-			data: {
-				"mode":'playlistMore',
-				"loadHit":loadHit,
-				"loadLimit":loadLimit,
-				"playlist": playlist
-			},
-			beforeSend: function() {
-				$(__this).text("loading");
-			},
-
-			success: function(data) {
-				var loaded = loadLimit * loadHit;
-				if (playlist_total <= loaded) {
-					$(__this).remove();
-				} else {
-					$(__this).text("Load More");
-				}
-				if (data == 'none') {
-					$('#playlist-pull').remove();
-				}
-				$(data).appendTo('#playlist_items').fadeIn('slow');
-				$('#playlist-pull').attr('dataHit', parseInt(loadHit) + 1);
-			}
-		});
-	});
-	/*Playlist load more end*/
-
-	var aspect_ratio = 1.77778
-	var $cb_player = $("#cb_player");
-
-	$(document).ready(function(){
-		$cb_player.height( $cb_player.width() / aspect_ratio );
-
-		var videoInfo = $("#videoDescription").text();
-		var newInfo = videoInfo.replace(/(((https?:\/\/)|([\s\t]))(www.)?([a-z0-9]+)\.[a-z]+)/g, '<a href="$1">$1</a>');
-		$("#videoDescription").html(newInfo);
-
-		comments_voting = '{$vdo.comment_voting}';
-		_cb.getCommentsNew(
-			'{$type}',
-			'{$vdo.videoid}',
-			'{$vdo.last_commented}',1,
-			'{$vdo.comments_count}',
-			'{$object_type}'
-		);
-
-		$("#reportVideo").on({
-			click : function(e){
-				e.preventDefault();
-				$("#flag_item").show();
-			}
-		});
-
-		$("#subscribeUser").on({
-			click: function(e){
-				e.preventDefault();
-				_cb.subscribeToChannelNew('{$video.userid}','subscribe_user');
-			}
-		});
-		var adHtml = $('.ad-holder').html();
-		if(adHtml<1){
-			$('.ad-holder').remove();
+		if (commentDataCheck !== null) {
+			$('#comment_box').val(commentDataCheck);
 		}
+		$('#comment_box').on('keyup', function() {
+			var comment_data = $('#comment_box').val();
+			$.cookie(cookieToSave, comment_data, { expires : 10, path : "/" });
+		});
+
+		$('#add_comment_button').on("click",function(){
+			$.cookie(cookieToSave, null, { path : "/" });
+		});
+		/*Cookie based comments backup end*/
+
+		var playlist_total = "{$total_items}";
+		$('#ShareUsers').on("keyup",function(){
+			var typed = $(this).val();
+			$.ajax({
+				url: baseurl+'/ajax.php',
+				type: 'post',
+				dataType: 'html',
+				data: {
+					"mode":'user_suggest',
+					"typed": typed
+				},
+				beforeSend: function() {
+				},
+
+				success: function(data) {
+					$('#suggested_users').html('');
+					var jsoned = $.parseJSON(data);
+					$( jsoned.matching_users ).each(function( index, element ) {
+						$('#suggested_users').append("<option label='"+element+"' value='"+element+"'>");
+					});
+				}
+			});
+		});
+
+		/*Playlist load more start*/
+		var playlist_total = "{$total_items}";
+		$('#playlist-pull').on("click",function(){
+			var __this = $(this);
+			loadHit = $(this).attr('dataHit');
+			loadLimit = $(this).attr('dataLimit');
+			playlist = $(this).attr('dataList');
+
+			$.ajax({
+				url: baseurl+'/ajax/watch.php',
+				type: 'post',
+				dataType: 'html',
+				data: {
+					"mode":'playlistMore',
+					"loadHit":loadHit,
+					"loadLimit":loadLimit,
+					"playlist": playlist
+				},
+				beforeSend: function() {
+					$(__this).text("loading");
+				},
+
+				success: function(data) {
+					var loaded = loadLimit * loadHit;
+					if (playlist_total <= loaded) {
+						$(__this).remove();
+					} else {
+						$(__this).text("Load More");
+					}
+					if (data == 'none') {
+						$('#playlist-pull').remove();
+					}
+					$(data).appendTo('#playlist_items').fadeIn('slow');
+					$('#playlist-pull').attr('dataHit', parseInt(loadHit) + 1);
+				}
+			});
+		});
+		/*Playlist load more end*/
+
+		var aspect_ratio = 1.77778
+		var $cb_player = $("#cb_player");
+
+		$(document).ready(function(){
+			$cb_player.height( $cb_player.width() / aspect_ratio );
+
+			var videoInfo = $("#videoDescription").text();
+			var newInfo = videoInfo.replace(/(((https?:\/\/)|([\s\t]))(www.)?([a-z0-9]+)\.[a-z]+)/g, '<a href="$1">$1</a>');
+			$("#videoDescription").html(newInfo);
+
+			comments_voting = '{$vdo.comment_voting}';
+			_cb.getCommentsNew(
+				'{$type}',
+				'{$vdo.videoid}',
+				'{$vdo.last_commented}',1,
+				'{$vdo.comments_count}',
+				'{$object_type}'
+				);
+
+			$("#reportVideo").on({
+				click : function(e){
+					e.preventDefault();
+					$("#flag_item").show();
+				}
+			});
+
+			$("#subscribeUser").on({
+				click: function(e){
+					e.preventDefault();
+					_cb.subscribeToChannelNew('{$video.userid}','subscribe_user');
+				}
+			});
+			var adHtml = $('.ad-holder').html();
+			if(adHtml<1){
+				$('.ad-holder').remove();
+			}
 		/*//Progress Bar
 		  $( '#circle' ).progressCircle();
 		  $( '#circle' ).progressCircle({
@@ -336,29 +392,29 @@
 			showPercentText : showPercentText,
 			thickness       : thickness,
 			circleSize      : circleSize
-		  });*/
+		});*/
 	});
 
-	$(document).on('click','#load-more-comments',function(){
-		var page = $(this).attr('page');
-		page = parseInt(page);
-		nextPage = page + 1;
-		$(this).text("Loading comments..")
-		_cb.getCommentsNew(
-			'{$type}',
-			'{$vdo.videoid}',
-			'{$vdo.last_commented}',page,
-			'{$vdo.comments_count}',
-			'{$object_type}'
-		);
-		$(this).attr('page', nextPage);
-		$(this).text("Load More")
-	})
+		$(document).on('click','#load-more-comments',function(){
+			var page = $(this).attr('page');
+			page = parseInt(page);
+			nextPage = page + 1;
+			$(this).text("Loading comments..")
+			_cb.getCommentsNew(
+				'{$type}',
+				'{$vdo.videoid}',
+				'{$vdo.last_commented}',page,
+				'{$vdo.comments_count}',
+				'{$object_type}'
+				);
+			$(this).attr('page', nextPage);
+			$(this).text("Load More")
+		})
 
-	var resizePlayer =  _cb.debounce(function() {
-		$cb_player.height( $cb_player.width() / aspect_ratio );
-	}, 500, false);
+		var resizePlayer =  _cb.debounce(function() {
+			$cb_player.height( $cb_player.width() / aspect_ratio );
+		}, 500, false);
 
-	$(window).resize(resizePlayer);
+		$(window).resize(resizePlayer);
 
-</script>
\ No newline at end of file
+	</script>
\ No newline at end of file