Added Cart model
fix merge conflict