diff --git a/module/bug/model.php b/module/bug/model.php
index dc97cd92fd..59bb5452d4 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -30,6 +30,18 @@ class bugModel extends model
         $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'bug');
         $selectHtml = $this->product->select($products, $productID, 'bug', 'browse', '', $branch, $moduleID, 'bug');
 
+<<<<<<< HEAD
+        if($this->app->viewType == 'mhtml')
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
         $pageNav     = '';
         $pageActions = '';
         $isMobile    = $this->app->viewType == 'mhtml';
@@ -86,6 +98,7 @@ class bugModel extends model
             }
         }
         $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
         $this->lang->modulePageNav     = $pageNav;
         $this->lang->modulePageActions = $pageActions;
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index af4b4c8ad4..3b741f5058 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -110,8 +110,8 @@ class testsuiteModel extends model
     public function setLibMenu($libraries, $libID, $moduleID = 0)
     {
         $currentLibName = zget($libraries, $libID, '');
-        $selectHtml = '';
-        $isMobile   = $this->app->viewType == 'mhtml';
+        $isMobile       = $this->app->viewType == 'mhtml';
+        $selectHtml     = '';
         if(!empty($libraries))
         {
             if($isMobile)
@@ -137,7 +137,7 @@ class testsuiteModel extends model
                 $dropMenuLink = helper::createLink('tree', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library");
                 $selectHtml .= "<div class='btn-group'><button id='currentModule' data-toggle='dropdown' type='button' class='btn btn-limit'>{$moduleName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
                 $selectHtml .= '<div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
-                $selectHtml .= "</div></div>";
+                $selectHtml .= "</div></div></div>";
             }
             else
             {
diff --git a/module/testtask/model.php b/module/testtask/model.php
index a39828be99..2fb13da51e 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -26,24 +26,36 @@ class testtaskModel extends model
         $this->loadModel('product')->setMenu($products, $productID, $branch);
         $selectHtml = $this->product->select($products, $productID, 'testtask', 'browse', '', $branch);
 
-        if($testtask)
+        if($this->app->viewType == 'mhtml')
         {
-            $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'));
-
-            $selectHtml .= "<div class='btn-group angle-btn'>";
-            $selectHtml .= "<div class='btn-group'>";
-            $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $testtasks[$testtask]->name . " <span class='caret'></span></a>";
-            $selectHtml .= "<ul class='dropdown-menu'>";
-            foreach($testtasks as $testtask) $selectHtml .= '<li>' . html::a(helper::createLink('testtask', 'cases', "taskID=$testtask->id"), "<i class='icon icon-file-o'></i> {$testtask->name}") . '</li>';
-            $selectHtml .= "</ul>";
-            $selectHtml .= "</div>";
-            $selectHtml .= "</div>";
-
-            $this->lang->modulePageActions = '';
-            if(common::hasPriv('testtask', 'view'))     $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), "<i class='icon icon-file-text'> </i>" . $this->lang->testtask->view, '', "class='btn'");
-            if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), "<i class='icon icon-flag'> </i>" . $this->lang->testtask->reportField, '', "class='btn'");
+            $productIndex = $selectHtml;
         }
+        else
+        {
+            if($testtask)
+            {
+                $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'));
 
+                $selectHtml .= "<div class='btn-group angle-btn'>";
+                $selectHtml .= "<div class='btn-group'>";
+                $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $testtasks[$testtask]->name . " <span class='caret'></span></a>";
+                $selectHtml .= "<ul class='dropdown-menu'>";
+                foreach($testtasks as $testtask) $selectHtml .= '<li>' . html::a(helper::createLink('testtask', 'cases', "taskID=$testtask->id"), "<i class='icon icon-file-o'></i> {$testtask->name}") . '</li>';
+                $selectHtml .= "</ul>";
+                $selectHtml .= "</div>";
+                $selectHtml .= "</div>";
+
+                $this->lang->modulePageActions = '';
+                if(common::hasPriv('testtask', 'view'))     $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), "<i class='icon icon-file-text'> </i>" . $this->lang->testtask->view, '', "class='btn'");
+                if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), "<i class='icon icon-flag'> </i>" . $this->lang->testtask->reportField, '', "class='btn'");
+            }
+
+<<<<<<< HEAD
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
         $pageNav     = '';
         $pageActions = '';
         $isMobile    = $this->app->viewType == 'mhtml';
@@ -69,6 +81,7 @@ class testtaskModel extends model
             }
         }
         $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
         $this->lang->modulePageNav     = $pageNav;
         $this->lang->modulePageActions = $pageActions;