Conflict resolution

There was a conflict I missed causing a glitch that hid the monetary
donations from the treasurer. Fixed now.