Conflict i model fixed