Moved to a new repo with composer
conflict fix