diff --git a/tests/smoke/ci.sh b/tests/smoke/ci.sh
index dfdbbb35..edfb8157 100755
--- a/tests/smoke/ci.sh
+++ b/tests/smoke/ci.sh
@@ -18,7 +18,6 @@ pushd /tmp/osl/osl-python-package
   circleci config validate
 popd
 
-<<<<<<< HEAD
 . ${SMOKE_DIR}/base-template.sh "use_azure_pipelines=yes use_conda=yes"
 pushd /tmp/osl/osl-python-package
   python "${SMOKE_DIR}/../scripts/check_azure_pipelines.py" ${SMOKE_DIR}/schemas/azure-pipelines.json azure-pipelines.yml
@@ -27,7 +26,6 @@ popd
 . ${SMOKE_DIR}/base-template.sh "use_azure_pipelines=yes use_pyenv=yes"
 pushd /tmp/osl/osl-python-package
   python "${SMOKE_DIR}/../scripts/check_azure_pipelines.py" ${SMOKE_DIR}/schemas/azure-pipelines.json azure-pipelines.yml
-=======
 
 . ${SMOKE_DIR}/base-template.sh "use_gitlab_ci=yes use_conda=yes"
 pushd /tmp/osl/osl-python-package
@@ -37,5 +35,4 @@ popd
 . ${SMOKE_DIR}/base-template.sh "use_gitlab_ci=yes use_pyenv=yes"
 pushd /tmp/osl/osl-python-package
   python "${SMOKE_DIR}/scripts/check-gitlab-ci.sh" ${SMOKE_DIR}/schemas/gitlab-ci-schema.json .gitlab-ci.yml
->>>>>>> 71dc586 (add check to smoke tests)
 popd