diff --git a/src/main/webapp/kofair_case_seed/usr/scripts/layout.js b/src/main/webapp/kofair_case_seed/usr/scripts/layout.js
index 9510ad62..5ce2a4a9 100644
--- a/src/main/webapp/kofair_case_seed/usr/scripts/layout.js
+++ b/src/main/webapp/kofair_case_seed/usr/scripts/layout.js
@@ -17,10 +17,7 @@ function header() {
 
   $(".menu_depth01").each(function (idx, itm) {
     $(itm).find("a").each(function (idx2, itm2) {
-<<<<<<< HEAD
       // console.log(idx2, itm2, $(itm).find("a").length);
-=======
->>>>>>> refs/heads/tolag3
       if ($(itm).find("a").length - 1 == idx2) {
         $(itm2).addClass("last");
       } else if (idx2 == 0) {