diff --git a/.gitignore b/.gitignore
index b2cc048..0ba3b96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,16 @@
 aws/aws_simple/.terraform/modules/modules.json
+<<<<<<< HEAD
 aws/aws_asg/.terraform/modules/modules.json
+=======
+aws/aws_asg/.terraform.lock.hcl
+aws/aws_asg/.terraform/terraform.tfstate
+aws/aws_asg/.terraform/modules/modules.json
+aws/aws_asg/.terraform/providers/registry.terraform.io/hashicorp/aws/5.26.0/linux_amd64/terraform-provider-aws_v5.26.0_x5
+aws/aws_vpc_peering/.terraform.lock.hcl
+aws/aws_vpc_peering/.terraform/terraform.tfstate
+aws/aws_vpc_peering/.terraform/providers/registry.terraform.io/hashicorp/aws/5.26.0/linux_amd64/terraform-provider-aws_v5.26.0_x5
+aws/s3/.terraform.lock.hcl
+aws/s3/terraform.tfstate
+aws/s3/terraform.tfstate.backup
+aws/s3/.terraform/providers/registry.terraform.io/hashicorp/aws/5.26.0/linux_amd64/terraform-provider-aws_v5.26.0_x5
+>>>>>>> eba3a4b6220eab2dcaa775958e284369dfd5b9ca
diff --git a/aws/aws_asg/modules/ec2/ec2-east/user-data.sh b/aws/aws_asg/modules/ec2/ec2-east/user-data.sh
index b9e8710..d8a5d26 100644
--- a/aws/aws_asg/modules/ec2/ec2-east/user-data.sh
+++ b/aws/aws_asg/modules/ec2/ec2-east/user-data.sh
@@ -16,7 +16,7 @@ sudo chmod 600 /home/greg/.ssh/authorized_keys
 sudo chown -R greg:greg /home/greg/.ssh
 
 # Add your public key to authorized_keys
-sudo echo "" >> /home/greg/.ssh/authorized_keys
+sudo echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCdOF80z0piQEnYzNCu2OGvOJdm7+3wfDuiC+Jzi8VbSC5VW4iJAQXOuDNGLzyqNi6uMjI77xpEL6Xzn29uJiQti6Y/LxhOZwNNIQiGUpFco1wkBYeBFbtgHQxsMLwumrxQGEj2fyCiSrACAPyy/l1fP4mlN7abBGD5aozBrYKxXPS/kfwO5nsWmw27RgTzfHJzie2dUU3ew/kd7td3wEdWrRXq8wNbu+yvAyiog54huUUWmYZwY3QVwXr6R1wsVudawM6BEl45QFq+hdB4t83azHG94XLy2NCAncohdU7zP40nsbvIDyh+4wIKeU90z6TLrXfHUYuBT6/ky7qOFm/Ym1QG4zCDz3jin8Qoa31PGaObzj/zoMJXgOXKcp16W0j9SZAenvnSfuWUEfBR1yBRR0T5Wg5v1vi7KGBTATaz8el802uliL+yZbGtMbNpAPGR5nK5C4yorf8yVYvIgo/LJaWCDND2O1e2mdut1WyRmvIwMnq7PFZT8zAsgGXfhDM= greg@ligma" >> /home/greg/.ssh/authorized_keys
 
 # Set hostname
 INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)
diff --git a/aws/aws_asg/modules/ec2/ec2-west/user-data.sh b/aws/aws_asg/modules/ec2/ec2-west/user-data.sh
index b845ff9..d8a5d26 100644
--- a/aws/aws_asg/modules/ec2/ec2-west/user-data.sh
+++ b/aws/aws_asg/modules/ec2/ec2-west/user-data.sh
@@ -16,8 +16,7 @@ sudo chmod 600 /home/greg/.ssh/authorized_keys
 sudo chown -R greg:greg /home/greg/.ssh
 
 # Add your public key to authorized_keys
-sudo echo "
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCdOF80z0piQEnYzNCu2OGvOJdm7+3wfDuiC+Jzi8VbSC5VW4iJAQXOuDNGLzyqNi6uMjI77xpEL6Xzn29uJiQti6Y/LxhOZwNNIQiGUpFco1wkBYeBFbtgHQxsMLwumrxQGEj2fyCiSrACAPyy/l1fP4mlN7abBGD5aozBrYKxXPS/kfwO5nsWmw27RgTzfHJzie2dUU3ew/kd7td3wEdWrRXq8wNbu+yvAyiog54huUUWmYZwY3QVwXr6R1wsVudawM6BEl45QFq+hdB4t83azHG94XLy2NCAncohdU7zP40nsbvIDyh+4wIKeU90z6TLrXfHUYuBT6/ky7qOFm/Ym1QG4zCDz3jin8Qoa31PGaObzj/zoMJXgOXKcp16W0j9SZAenvnSfuWUEfBR1yBRR0T5Wg5v1vi7KGBTATaz8el802uliL+yZbGtMbNpAPGR5nK5C4yorf8yVYvIgo/LJaWCDND2O1e2mdut1WyRmvIwMnq7PFZT8zAsgGXfhDM= greg@ligma" >> /home/greg/.ssh/authorized_keys
+sudo echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCdOF80z0piQEnYzNCu2OGvOJdm7+3wfDuiC+Jzi8VbSC5VW4iJAQXOuDNGLzyqNi6uMjI77xpEL6Xzn29uJiQti6Y/LxhOZwNNIQiGUpFco1wkBYeBFbtgHQxsMLwumrxQGEj2fyCiSrACAPyy/l1fP4mlN7abBGD5aozBrYKxXPS/kfwO5nsWmw27RgTzfHJzie2dUU3ew/kd7td3wEdWrRXq8wNbu+yvAyiog54huUUWmYZwY3QVwXr6R1wsVudawM6BEl45QFq+hdB4t83azHG94XLy2NCAncohdU7zP40nsbvIDyh+4wIKeU90z6TLrXfHUYuBT6/ky7qOFm/Ym1QG4zCDz3jin8Qoa31PGaObzj/zoMJXgOXKcp16W0j9SZAenvnSfuWUEfBR1yBRR0T5Wg5v1vi7KGBTATaz8el802uliL+yZbGtMbNpAPGR5nK5C4yorf8yVYvIgo/LJaWCDND2O1e2mdut1WyRmvIwMnq7PFZT8zAsgGXfhDM= greg@ligma" >> /home/greg/.ssh/authorized_keys
 
 # Set hostname
 INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)