Next attempt to fix composer autoloading
fixed conflict