more mpi
fixed merge conflict in feltor.cuh