[corpus] fix merge conflicts

3 jobs for 462-missing-default-list-error in 25 minutes and 48 seconds (queued for 5 seconds)
latest
Status Job ID Name Coverage
  Check Lint
passed #17900
check-lint

00:07:32

 
  Compile
passed #17901
compile

00:10:11

 
  Test
passed #17902
test

00:08:05