Ligne exploration
Conflict resolved