Merge conflict, updated compiler and MPI.