finish wager form
fixed merge conflicts