Composer
Fix conflicts
Method corrections