Update composer
Fix confilct merge