fixing merge conflict error, removing extra return statement
fixing merge conflict error, removing extra return statement

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