redeem done
fix conflict