Removed conflicts in cart.php file