diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cbbce979b2c1cdf74a5abf5b4311303b59a4828..890d21a24042e4efa3e98864c49a39927bd8588e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,7 @@ variables:
   CI_IMAGES_BASEPATH: "git.seco.com:5050/edgehog/yocto_ng/"
   CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/seco-manifest/python3.9
   CI_IMAGES_REV: latest
-<<<<<<< HEAD
   CI_IMAGE_PYTHON: "git.seco.com:5050/edgehog/yocto_ng/seco-manifest/python3.9:${CI_IMAGES_REV}"
-=======
-  CI_IMAGE_PYTHON: "git.seco.com:5050/edgehog/yocto_ng/seco-manifest/python3.9:CI_IMAGES_REV"
->>>>>>> b679bc717765558814e0e1a6855bab5941d17255
   CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
 
 image: "${CI_IMAGE_PYTHON}" #secodocker/manifest-test:vtemp #