Fix bad merge
Fix bad merge

bradgearon/ChurchCRM,ChurchCRM/CRM,bradgearon/ChurchCRM,ChurchCRM/CRM,bradgearon/ChurchCRM,ChurchCRM/CRM,ChurchCRM/CRM,ChurchCRM/CRM,bradgearon/ChurchCRM,bradgearon/ChurchCRM