fixed pledged/unpledged visibility
fixed visibility for pledge and unpledge buttons
fixed merge
merge conflict