added cart functionality
resolve conflicts