fix: 解决冲突报错

4 jobs from master in 3 minutes 3 seconds (queued for 6 minutes 25 seconds)
Status Job ID Name Coverage
  Install
passed #149832
civ_base allowed to fail manual
install

01:12

 
  Package
passed #149864
civ_base allowed to fail manual
package

01:09

passed #149833
civ_base allowed to fail manual
package

05:16

 
  Push
passed #149834
civ_base allowed to fail manual
push

00:41