fix: edit conflict

Status Job ID Name Coverage
  Refresh
manual #262320
civ_base allowed to fail manual
refresh
 
  Install
passed #262321
civ_base allowed to fail manual
install

01:34

 
  Package
passed #262322
civ_base manual
package

06:57

 
  Push
passed #262410
civ_base
push2021

01:18

passed #262323
civ_base
pushSolution

00:27

failed #262324
civ_base
push2021

00:02