wiriing up pledge form
fix merge conflicts