[PD] gem / msd conflict