modifiqué defaults
resolve merge