diff --git a/module/bug/model.php b/module/bug/model.php
index 45db8dde1c..1da8fbe49c 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2064,16 +2064,11 @@ class bugModel extends model
             ->andWhere('deleted')->eq(0)
             ->orderBy('id desc')
             ->beginIF($limit)->limit($limit)->fi()
-<<<<<<< Updated upstream
             ->fetchAll();
 
         foreach($data as $bug) $bugs[$bug->id] = $bug->id . ':' . $bug->title;
-        return $bugs;
-=======
-            ->fetchPairs();
 
-        return array('' => '') + $bugs;
->>>>>>> Stashed changes
+        return $bugs;
     }
 
     /**