fix payoff
merge