Fix main.handlebars being commited with the merge conflict still in it
Fix main.handlebars being commited with the merge conflict still in it

ONSdigital/babbage,ONSdigital/babbage,ONSdigital/babbage,ONSdigital/babbage