modified model and form
Fixed conflict