fix conflicts for gromacs_lsdmap on stampede