Update composer
Merging secondary version
Fix merge
Cleanup vendors