diff --git a/Makefile b/Makefile
index 4a057433226fc69dabcf0e08d38b49ad05d433aa..8221ad4efbee4054f58cf6d51675eb8d574b222c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 MAKEFILE_DIR := $(dir $(firstword $(MAKEFILE_LIST)))
 GCP_ROOT_DIR := $(realpath ${MAKEFILE_DIR}../..)
 # include env vars
-include ${GCP_ROOT_DIR}/env.mk
+include gcp-env.mk
 include ${MAKEFILE_DIR}/env.mk
 export
 
diff --git a/gcp-env.mk b/gcp-env.mk
index 50492e638e24ea436d530e3413cf6db5472ec18f..d7f0093424a78cf48eefc8e60c766902affd409d 100644
--- a/gcp-env.mk
+++ b/gcp-env.mk
@@ -1,9 +1,9 @@
-# GENERATED GCP SHARED ENVIRONMENT VARIABLES. DO NOT EDIT.
-# The source file is env.sh in the uit-authnz repository.
-# If it is changed, re-run 'make sync-env' in uit-authnz repository.
-#
 # Terraform version
+<<<<<<< HEAD
 export TF_VERSION = "= 0.12.19"
+=======
+TF_VERSION = 1.2.7
+>>>>>>> 09ba102 (Sync up gcp-env.mk; Change Makefile to use include gcp-env.mk instead of from ROOT so the make build can run from anywhere.)
 
 # GCLOUD Configuration
 export GOOGLE_CLOUD_PROJECT=uit-authnz
@@ -17,6 +17,11 @@ export GCP_DNS_DOMAIN=iam.stanford.edu
 export ACME_DNS_PROVIDER=${GCP_PROJECT_NAME}-d
 export GCP_NETWORK=services
 
+# Default SSL policy
+MIN_TLS_VERSION=TLS_1_2
+SSL_POLICY_PROFILE=MODERN
+SSL_POLICY_NAME=${MIN_TLS_VERSION}-${SSL_POLICY_PROFILE}
+
 # Default Docker registry
 export DOCKER_NAMESPACE=${GCP_PROJECT_ID}
 export DOCKER_REGISTRY=gcr.io
@@ -49,9 +54,12 @@ export DOCKER_REGISTRY_PASSWORD_PATH_GCR_USER=${SEC_PATH}/common/gcr-user
 export DOCKER_REGISTRY_PASSWORD_PATH_GCR_PULL=${SEC_PATH}/common/gcr-pull
 export SPLUNK_ADDON_SA=${SEC_PATH}/common/splunk-addon-sa
 
+<<<<<<< HEAD
 # Drone server for CI/CD
 export DRONE_SERVER=https://drone.svc.stanford.edu
 
+=======
+>>>>>>> 09ba102 (Sync up gcp-env.mk; Change Makefile to use include gcp-env.mk instead of from ROOT so the make build can run from anywhere.)
 # GitLab ci configuration
 export GITLAB_SERVER=https://code.stanford.edu
 export GITLAB_SEC_FILE=../.gitlab-ci.sec
@@ -117,7 +125,16 @@ export FORCE_DESTROY_KDC_BACKUP_BUCKET=true
 export KDC_NUMBER_NEWER_VERSIONS_BACKUP_BUCKET=30
 
 # WALLET backup bucket
+<<<<<<< HEAD
 export WALLET_BACKUP_BUCKET=${GCP_ENVIRONMENT}-${GCP_PROJECT_NAME}-wallet-backup
 export WALLET_BACKUP_BUCKET_LOCATION=US
 export FORCE_DESTROY_WALLET_BACKUP_BUCKET=true
 export WALLET_NUMBER_NEWER_VERSIONS_BACKUP_BUCKET=30
+=======
+WALLET_BACKUP_BUCKET=${GCP_ENVIRONMENT}-${GCP_PROJECT_NAME}-wallet-backup
+WALLET_BACKUP_BUCKET_LOCATION=US
+FORCE_DESTROY_WALLET_BACKUP_BUCKET=true
+WALLET_NUMBER_NEWER_VERSIONS_BACKUP_BUCKET=30
+
+ GITLAB_REPO=authnz/uit-authnz
+>>>>>>> 09ba102 (Sync up gcp-env.mk; Change Makefile to use include gcp-env.mk instead of from ROOT so the make build can run from anywhere.)