Fixed bug with conflict using model method