Fixing up donations list for donor statement, subscriptions list too
resolving conflicts