
Conflicts: marketplace/code/ui/frontend/ConsultantsDirectoryPage.php marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss
Conflicts: marketplace/code/ui/frontend/ConsultantsDirectoryPage.php marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss