From 6e05137037f4caa8bf3c6b942001c14bf2f9a598 Mon Sep 17 00:00:00 2001
From: Matthew Davis <38021615+mattdavis0351@users.noreply.github.com>
Date: Tue, 12 Nov 2019 10:46:18 -0800
Subject: [PATCH] Update config.yml

---
 config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config.yml b/config.yml
index d00bab3..f165612 100644
--- a/config.yml
+++ b/config.yml
@@ -196,6 +196,11 @@ steps:
   - type: mergeBranch
     head: aws-configuration
     base: master
+    
+  # merge master into staging-test so staging-test has the appropriate updates
+  - type: mergeBranch
+    head: master
+    base: staging-test
 
   # we must prepare next pr now so we can point to it. We ask the user to test this action by adding a label
   - type: createPullRequest