merged a D&D patch