Correction composer.lock (supression des <<<<HEAD)