Resolve merge conflict

.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
failed cloud

 
External cloud
No job trace