Correction conflit composer.lock