clean Harry's code

app/assets/javascripts/orbitdesktop.js

@@ -574,20 +574,6 @@ var orbitDesktop = function(dom){
          });
         }else{
           $(o.contentHolder).html(o.desktopData[o.currentface]);
-<<<<<<< Updated upstream
-          header_ani();
-          try {
-            if(!customload){
-              o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
-            } else {
-              if(submenuitem){
-                o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
-              } else {
-                o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data);
-              }      
-            }
-          } catch(EX){}
-=======
           try{
             if(!customload){
               o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
@@ -598,7 +584,6 @@ var orbitDesktop = function(dom){
                   o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
               }
             }catch(EX){}
->>>>>>> Stashed changes
           cache = true;
           if(typeof o.data_method != "undefined"){
              if(o.data_method != ""){