fixed merge conflict
fixed merge conflict


Former-commit-id: e83479a20439c8b4501946894c13ad4adfcebef6
InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service