Changement Design
Resolve conflict