change agenda and remove banner from pcluster manager

ubik76 · mhuguesaws · commit c5399099a591 · 2022-05-26T12:27:42.000-05:00
diff --git a/content/03-hpc-aws-parallelcluster-workshop/08-connect-pcmanager-lab.md b/content/03-hpc-aws-parallelcluster-workshop/08-connect-pcmanager-lab.md
@@ -6,11 +6,7 @@ tags = ["tutorial", "initialize", "ParallelCluster"]
 +++
 
 {{%notice note%}}
-<<<<<<< HEAD
 If you are participating in this workshop as part of ISC22, then *PCluster Manager* will already be deployed for you. 
-=======
-If you are participating in this workshop as part of ISC22, then *PCluster Manager* will already be deployed for you, and you can continue with the steps below. If not, you will first have to deploy PCluster Manager from [AWS CloudFormation](https://github.com/aws-samples/pcluster-manager) to your account.
->>>>>>> fb7b04f4d1e2a8b817eb3f814bf43d51dd48800c
 {{% /notice %}}
 
 Once your PCluster Manager CloudFormation stack has been deployed, you can follow these steps to connect to it:
