composer update
Fix merge conflicts