[MERGE] fix conflicts

Status Job ID Name Coverage
  Cabal
canceled #16041
cabal

 
  Stack
canceled #16042
stack

 
  Bench
canceled #16043
allowed to fail manual
bench

 
  Test
canceled #16044
test