diff --git a/.circleci/files/cloudfront.yml b/.circleci/files/cloudfront.yml
index ab71c65..c2ec87e 100644
--- a/.circleci/files/cloudfront.yml
+++ b/.circleci/files/cloudfront.yml
@@ -38,7 +38,11 @@ Outputs:
     Value: !Sub ${WorkflowID}
     Description: URL for website hosted on S3
     Export:
+<<<<<<< HEAD
+      Name: WorkflowID
+=======
       Name: !Sub Cloudfront-${WorkflowID}
   DomainName:
     Description: Domain name
     Value: !Join ['', ['https://', !GetAtt WebpageCDN.DomainName]]
+>>>>>>> master