The general rule is that neither
will nor
would can occur in the
if-clause of a conditional structure.
One exception is what I call "bargaining" will. Here there is an exchange of favors: The boss will offer the promotion; Gordon will be more tactful.
Sometimes "bargaining" will can be paraphrased as "consent (in return) to".
I will buy you a beer if you [will / consent (in return) to] stop criticizing me!
CJ