remove ">>>>>>> fdc0651ca6e22d1147f93d4a96997e2a16760573" In cart_model