Autoload conflict fixed