Assets
Conflits resolution