Fix merge issues in wp-shopping-cart.php