I’ve officially given up trying to resolve the conflicts with mine and @Eclsnowman 's branch of the Herculien on github… Instead, I’m hosting my mods in a separate repository that can be found here: https://github.com/drtrain/Herculien-Mods
These files should open for everyone with no conflicts and contain my most up-to-date mads as well as the originals (labeled as deprecated). Eventually I’ll try and get around to merging my branch with Eric’s but for now, this will do.