Update composer
Merge confilct fix