Fixes pledge/bounty buttons
Resolve merge conflicts