diff --git a/platform/heroku.php b/platform/heroku.php
index cc70656..1332f9d 100644
--- a/platform/heroku.php
+++ b/platform/heroku.php
@@ -240,11 +240,7 @@ function_name:' . $_SERVER['function_name'] . '<br>
 <button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
 }
 
-<<<<<<< HEAD:platform/heroku.php
 function OnekeyUpate($auth = 'BingoKingo', $project = 'Tfo', $branch = 'master')
-=======
-function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
->>>>>>> upstream/master:function/heroku.php
 {
     //'https://github.com/qkqpttgf/OneManager-php/tarball/master/';
     $source = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . $branch . '/';