created line item model
fixed conflicts