Fix conflict with testnet

[zmcNotafraid]

No description provided.

[codecov-commenter]

Codecov Report

Attention: 46 lines in your changes are missing coverage. Please review.

Comparison is base (0b4da62) 66.95% compared to head (0d05b24) 67.30%.
Report is 35 commits behind head on master.

❗ Current head 0d05b24 differs from pull request most recent head 30ae902. Consider uploading reports for the commit 30ae902 to get more accurate results

Files	Patch %	Lines
.../controllers/api/v1/ckb_transactions_controller.rb	39.28%	17 Missing ⚠️
lib/tasks/migration/generate_referring_cells.rake	11.76%	15 Missing ⚠️
app/models/concerns/display_cells.rb	92.68%	6 Missing ⚠️
app/workers/contract_statistic_worker.rb	0.00%	5 Missing ⚠️
.../controllers/api/v2/ckb_transactions_controller.rb	60.00%	2 Missing ⚠️
lib/scheduler.rb	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1511      +/-   ##
==========================================
+ Coverage   66.95%   67.30%   +0.35%     
==========================================
  Files         282      283       +1     
  Lines        7608     7635      +27     
==========================================
+ Hits         5094     5139      +45     
+ Misses       2514     2496      -18     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.