fix

docs.it4i/anselm/job-submission-and-execution.md

@@ -361,13 +361,8 @@ Example jobscript for an MPI job with preloaded inputs and executables, options
 SCRDIR=/scratch/$USER/myjob
 cd $SCRDIR || exit
 
-<<<<<<< HEAD
-# load the mpi module
-ml OpenMPI
-=======
 # load the MPI module
-module load openmpi
->>>>>>> readme
+ml OpenMPI
 
 # execute the calculation
 mpirun ./mympiprog.x