update composer
merge