diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 872e14d89..367aee0b6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,7 +26,10 @@ steps:
     mv !(gopath) '$(modulePath)'
     echo '##vso[task.prependpath]$(GOBIN)'
     echo '##vso[task.prependpath]$(GOROOT)/bin'
+<<<<<<< HEAD
     sudo apt install bzr
+=======
+>>>>>>> QED Azure pipeline
   displayName: 'Set up the Go workspace'
 
 - script: |
@@ -43,4 +46,7 @@ steps:
     go vet -composites=false ./...
   workingDirectory: '$(modulePath)'
   displayName: 'Get dependencies, then build'
+<<<<<<< HEAD
 
+=======
+>>>>>>> QED Azure pipeline