Correction mineure & merge