Resolving merge conflict
Resolving merge conflict

SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus