Fix leftover conflicts.

Jenkinsfile

@@ -6,7 +6,6 @@ void CreateCluster(String CLUSTER_SUFFIX) {
             export KUBECONFIG=/tmp/$CLUSTER_NAME-${CLUSTER_SUFFIX}
             export USE_GKE_GCLOUD_AUTH_PLUGIN=True
             source $HOME/google-cloud-sdk/path.bash.inc
-<<<<<<< HEAD
             ret_num=0
             while [ \${ret_num} -lt 15 ]; do
                 ret_val=0
@@ -22,13 +21,6 @@ void CreateCluster(String CLUSTER_SUFFIX) {
                 gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $GKERegion --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $GKERegion --quiet || true
                 exit 1
             fi
-=======
-            gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE
-            gcloud config set project $GCP_PROJECT
-            gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_PREFIX} --zone $GKERegion --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $GKERegion --quiet || true
-            gcloud container clusters create --zone $GKERegion $CLUSTER_NAME-${CLUSTER_PREFIX} --cluster-version=1.24 --machine-type=n1-standard-4 --preemptible --num-nodes=3 --network=jenkins-vpc --labels delete-cluster-after-hours=6 --subnetwork=jenkins-${CLUSTER_PREFIX} --no-enable-autoupgrade
-            kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user jenkins@"$GCP_PROJECT".iam.gserviceaccount.com
->>>>>>> 8617f8f8 (fix tests)
         """
    }
 }

e2e-tests/functions

@@ -763,14 +763,8 @@ compare_mongos_cmd() {
 	run_mongos "use ${database}\n db.${collection}.${command}()" "$uri" "mongodb" "$suffix" \
 		| egrep -v 'I NETWORK|W NETWORK|Error saving history file|Percona Server for MongoDB|connecting to:|Unable to reach primary for set|Implicit session:|versions do not match' \
 		| $sed -re 's/ObjectId\("[0-9a-f]+"\)//; s/-[0-9]+.svc/-xxx.svc/' \
-<<<<<<< HEAD
 			>$tmp_dir/${command}${postfix}
 	diff ${test_dir}/compare/${command}${postfix}.json $tmp_dir/${command}${postfix}
-=======
-			>$tmp_dir/${command}
-
-	diff ${test_dir}/compare/${command}${postfix}.json $tmp_dir/${command}
->>>>>>> 8617f8f8 (fix tests)
 }
 
 get_mongo_primary_endpoint() {