diff --git a/.travis.yml b/.travis.yml
index 9755cfdb1..696357d6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,10 @@ services:
 language: go
 branches:
   only:
+<<<<<<< HEAD
     - release-v1.2.0
+=======
+>>>>>>> 52c4d29f6... Remove csi-v0.3 from deploy.sh
     - master
 
 go: 1.12.x
diff --git a/deploy.sh b/deploy.sh
index 59f89d591..2b3b6a6c4 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -35,8 +35,13 @@ push_helm_charts() {
 	fi
 }
 
+<<<<<<< HEAD
 if [ "${TRAVIS_BRANCH}" == 'release-v1.2.0' ]; then
 	export ENV_CSI_IMAGE_VERSION='v1.2-canary'
+=======
+if [ "${TRAVIS_BRANCH}" == 'master' ]; then
+	export ENV_CSI_IMAGE_VERSION='canary'
+>>>>>>> 52c4d29f6... Remove csi-v0.3 from deploy.sh
 else
 	echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
 	exit 0 # Exiting 0 so that this isn't marked as failing