diff --git a/01 Introduction to CloudFormation/SimpleExample.yaml b/01 Introduction to CloudFormation/SimpleExample.yaml
index 6b1ae00..ca3fd71 100644
--- a/01 Introduction to CloudFormation/SimpleExample.yaml	
+++ b/01 Introduction to CloudFormation/SimpleExample.yaml	
@@ -6,4 +6,5 @@ Resources:
       ImageId: ami-467ca739 # Amazon Linux AMI in N.Virginia
       Tags:
         - Key: Name
-          Value: A simple example
+          Value: !Join [ " ", [ I, love, big, Drape ] ]
+#### this is a test of the CF automation
\ No newline at end of file
diff --git a/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml b/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml
index 2e6cbe1..a474147 100644
--- a/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml	
+++ b/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml	
@@ -4,3 +4,10 @@ Resources:
     Properties:
       InstanceType: t2.micro
       ImageId: ami-467ca739 # Amazon Linux AMI in N.Virginia
+<<<<<<< Updated upstream
+=======
+      Tags:
+      - key: Name
+        Value: A simple example
+        ### Quick update to test automation
+>>>>>>> Stashed changes