- Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer