edd_get_cart_item_discounted_price filter
edd_get_cart_item_discount_amount filter and renamed other filter
Renamed filters to be unique and match function names better
Fix merge conflict