diff --git a/webapp/controller/TempToolsController.class.php b/webapp/controller/TempToolsController.class.php
index 7ddc3b76..832acbf0 100644
--- a/webapp/controller/TempToolsController.class.php
+++ b/webapp/controller/TempToolsController.class.php
@@ -66,7 +66,6 @@ class TempToolsController extends BaseController {
         ));
     }
 
-<<<<<<< HEAD
     public function exportRankActivity()
     {
         $type = getReqVal('type', '');
@@ -114,8 +113,6 @@ class TempToolsController extends BaseController {
         }
     }
 
-=======
->>>>>>> master
     public function getRiskAccounts()
     {
         $accounts = array();