Some comments
Conflict solution