fixing tax payment
fixing conflict