Mod files for 0.10.0-rc5
Fix CONFLICT