new mods!
conflict resolved
new file!