check cart functionality
removed conflict in files