fix rebase

17 jobs for optimize_kl_refactoring in 60 minutes and 15 seconds (queued for 5 seconds)
Name Stage Failure
failed
test_mpi Test The script exceeded the maximum execution time set for the job
Finished processing dependencies for nifty8==8.0
$ mpiexec -n 2 --bind-to none pytest-3 -q test/test_mpi
................................................................................................................................................ [ 18%]
[ 18%]
................................................................................................................................................ [ 36%]
[ 36%]
................................................................................................................................................ [ 54%]
[ 54%]
................................................................................................................ERROR: Job failed: execution took longer than 1h0m0s seconds