architecture initiale
Conflict fixed