problem of not showing anything when we go inside the submenus solved

720p/Includes_HorzHome.xml

@@ -207,7 +207,7 @@
 			<height>3</height>
 			<texture>separator.png</texture>
 		</control>
-
+-->
 		<!--Home NavBar-->
 		<control type="group">
 			<include>horizontalhome-center</include>
@@ -307,7 +307,7 @@
 					<height>46</height>
 					<font>font11</font>
 					<label>31045</label>
-					<onclick>ActivateWindow(Videos,content,return)</onclick>
+					<onclick>ActivateWindow(Videos,Files,return)</onclick>
 					<textoffsetx>10</textoffsetx>
 					<textoffsety>8</textoffsety>
 					<onleft>Control.Move(9900,-1)</onleft>

720p/MyVideoNav.xml

@@ -13,7 +13,7 @@
 		<control type="image"> <!-- Show subject image here -->
 			<description>Movies/Video Logo</description>
 			<include>icon-header-commons</include>
-<<<<<<< HEAD
+
 			<!--<texture>icon-video-sml.png</texture>-->
 			<texture>flux-logo-big.png</texture>			
 			<visible>!Container.Content(tvshows) + !Container.Content(seasons) + !Container.Content(episodes) + !Container.Content(musicvideos)</visible>
@@ -31,9 +31,9 @@
 			<!--<texture>icon-musicvideo-sml.png</texture>-->
 			<texture>flux-logo-big.png</texture>
 			<visible>Container.Content(musicvideos)</visible>
-=======
+
 			<texture>icon-video-sml.png</texture>
->>>>>>> 987433c381cd8b8b459c569712c282f94dd430db
+
 		</control>
 
 
@@ -56,12 +56,11 @@
 			</control>
 			<control type="label">
 				<description>Number of files</description>
-<<<<<<< HEAD
 				<visible>Skin.HasSetting(homemenu-horizontal) | [!Skin.HasSetting(homemenu-vertical) + !Skin.HasSetting(homemenu-horizontal)]</visible>
 				<posy>13</posy>				<!--prints "(no of files)"-->
-=======
+
 				<posy>13</posy>
->>>>>>> 987433c381cd8b8b459c569712c282f94dd430db
+
 				<width min="40" max="90">auto</width>
 				<height>38</height>
 				<font>font13</font>

skin.flux

@@ -0,0 +1 @@
+/home/varun/.xbmc/addons/skin.flux