merge Martys mods and Rons mods