Update composer file
Fix merge conflicts