diff --git a/module/task/model.php b/module/task/model.php
index e29da4d4a8..ad9753411e 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2406,12 +2406,12 @@ class taskModel extends model
                     echo "</span>";
                     break;
                 case 'name':
-                    if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-caret-down"></i></a>';
                     if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "<span class='label label-info label-badge'>" . $branchGroups[$task->product][$task->branch] . '</span> ';
                     if(empty($task->children) and $task->module and isset($modulePairs[$task->module])) echo "<span class='label label-info label-badge'>" . $modulePairs[$task->module] . '</span> ';
                     if($child or !empty($task->parent)) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';
                     if(!empty($task->team)) echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';
                     echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color'") : "<span style='color: $task->color'>$task->name</span>";
+                    if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-caret-down"></i></a>';
                     if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");
                     break;
                 case 'type':
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index aaace84329..eaf3460839 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -17,8 +17,5 @@
 .tree li.active>a{background-color:#fff}
 .tree li>a:hover{background-color:#fff}
 .detail-content{padding: 5px 0 0 0px;}
-<<<<<<< HEAD
 #sidebar>.sidebar-toggle>.icon{color:#2196f3}
-=======
 .body-modal .main-header>h2{font-weight:bold;}
->>>>>>> c4e473df148639a9cb9f22676ae4a9bdc6e640ac