diff --git a/module/action/control.php b/module/action/control.php
index c7926adfc5..48253b46d5 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -115,6 +115,11 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
+<<<<<<< HEAD
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> 730c63859893f773f598f4b484b2c349bebd23cd
         /* Get the project name of executions. */
         if($browseType == 'execution')
         {
@@ -125,6 +130,10 @@ class action extends control
             $this->view->projectList = $projectList;
         }
 
+<<<<<<< HEAD
+=======
+>>>>>>> Stashed changes
+>>>>>>> 730c63859893f773f598f4b484b2c349bebd23cd
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 33062b95bf..6be172e54d 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -85,20 +85,9 @@
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
           <?php endif;?>
-          <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
-          <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
-          <th class='c-actions'><?php echo $lang->actions;?></th>
-        </tr>
-      </thead>
-      <tbody>
-        <?php foreach($trashes as $action):?>
-        <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
-        <tr>
-          <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
-          <td><?php echo $action->objectID;?></td>
-          <td class='text-left'>
-            <?php
-            $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
+          <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
+          <th class='w-250px'><?php echo $this->lang->execution->project;?></th>
+          <?php endif;?> <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th> <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th> <th class='c-actions'><?php echo $lang->actions;?></th> </tr> </thead> <tbody> <?php foreach($trashes as $action):?> <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?> <tr> <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td> <td><?php echo $action->objectID;?></td> <td class='text-left'> <?php $params     = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
             $methodName = 'view';
             if($module == 'caselib')
             {