This is the solution model
This is the solution model conflict resolved