upgrade composer
push
merge