diff --git a/app/Models/Ledger.php b/app/Models/Ledger.php
index 8e170c0..cf538bf 100644
--- a/app/Models/Ledger.php
+++ b/app/Models/Ledger.php
@@ -49,20 +49,12 @@ class Ledger extends Model
         return $this->hasMany(LedgerItem::class);
     }
 
-<<<<<<< Updated upstream
     /**
      * 是否允许重新上报
      */
     public function allowReReport(): bool
     {
         return is_null($this->ledger_amount) && is_null($this->actual_commission) && is_null($this->actual_income);
-=======
-    public function canReport(): bool
-    {
-        return is_null($this->ledger_amount)
-            && is_null($this->actual_commission)
-            && is_null($this->actual_income);
->>>>>>> Stashed changes
     }
 
     protected function ledgerDifference(): Attribute
diff --git a/routes/api.php b/routes/api.php
index eb86f6d..af64cab 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -3,13 +3,8 @@
 use App\Http\Controllers\Api\Auth\AccessTokenController;
 use App\Http\Controllers\Api\ComplaintController;
 use App\Http\Controllers\Api\FeedbackController;
-<<<<<<< Updated upstream
 use App\Http\Controllers\Api\Ledger\LedgerController;
 use App\Http\Controllers\Api\Ledger\LotteryTypeController;
-=======
-use App\Http\Controllers\Api\LedgerController;
-use App\Http\Controllers\Api\LotteryTypeController;
->>>>>>> Stashed changes
 use App\Http\Controllers\Api\StatsController;
 use Illuminate\Support\Facades\Route;
 
@@ -28,18 +23,11 @@ Route::group([
 
     Route::get('/stats/dashboard', [StatsController::class, 'dashboard']);
 
-<<<<<<< Updated upstream
     // 数据上报
     Route::post('/ledger/ledgers', [LedgerController::class, 'store']);
     Route::get('/ledger/ledgers/{date}', [LedgerController::class, 'show']);
     Route::get('/ledger/lottery-types', [LotteryTypeController::class, 'index']);
 
-=======
-    Route::resource('/ledger', LedgerController::class)->only(['store', 'show']);
-
-    // 彩种类型
-    Route::get('lottery-types', [LotteryTypeController::class, 'index']);
->>>>>>> Stashed changes
     // 举报投诉
     Route::post('complaints', [ComplaintController::class, 'store']);
     // 意见箱